From f0e9c7745f0f01e93b00306c2ba64b0586e70b9d Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期二, 04 三月 2025 10:56:41 +0800
Subject: [PATCH] 1. 添加通过 alarm_event_id 解除报警（更新结束时间） 2. 通过多个属性查找并解除报警（更新结束时间）
---
SourceCode/Bond/Servo/CEqAlarmStep.cpp | 92 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.cpp b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
index 9d2b593..0b42394 100644
--- a/SourceCode/Bond/Servo/CEqAlarmStep.cpp
+++ b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
@@ -26,18 +26,19 @@
char szBuffer[64];
int nRet = m_pCclink->ReadData2(m_station, DeviceType::W,
m_nAlarmDev, 64, szBuffer);
- if (0 == nRet) {
- m_nAlarmState = (unsigned int)CToolUnits::toInt16(&szBuffer[0]);
- m_nUnitId = (unsigned int)CToolUnits::toInt16(&szBuffer[2]);
- m_nAlarmId = (unsigned int)CToolUnits::toInt16(&szBuffer[4]);
- m_nAlarmCode = (unsigned int)CToolUnits::toInt16(&szBuffer[6]);
- m_nAlarmLevel = (unsigned int)CToolUnits::toInt16(&szBuffer[8]);
-
- LOGI("<CEqAlarmStep> Equipment Alarm state Changed<State:%d, Unit:%d, Level:%d, Code:%d, ID:%d>\n",
- m_nAlarmState, m_nUnitId, m_nAlarmLevel, m_nAlarmCode, m_nAlarmId,
- m_strText.c_str(), m_strDescription.c_str());
+ if (0 != nRet) {
+ return -1;
}
+ m_nAlarmState = (unsigned int)CToolUnits::toInt16(&szBuffer[0]);
+ m_nUnitId = (unsigned int)CToolUnits::toInt16(&szBuffer[2]);
+ m_nAlarmId = (unsigned int)CToolUnits::toInt16(&szBuffer[4]);
+ m_nAlarmCode = (unsigned int)CToolUnits::toInt16(&szBuffer[6]);
+ m_nAlarmLevel = (unsigned int)CToolUnits::toInt16(&szBuffer[8]);
+
+ LOGI("<CEqAlarmStep> Equipment Alarm state Changed<State:%d, Unit:%d, Level:%d, Code:%d, ID:%d>\n",
+ m_nAlarmState, m_nUnitId, m_nAlarmLevel, m_nAlarmCode, m_nAlarmId,
+ m_strText.c_str(), m_strDescription.c_str());
return 0;
}
@@ -58,10 +59,75 @@
return 0;
}
- void CEqAlarmStep::setAlarmDev(int nDev)
- {
- m_nAlarmDev = nDev;
+ // 获取和设置 AlarmDev
+ int CEqAlarmStep::getAlarmDev() const {
+ return m_nAlarmDev;
}
+ void CEqAlarmStep::setAlarmDev(int nAlarmDev) {
+ m_nAlarmDev = nAlarmDev;
+ }
+ // 获取和设置 AlarmState
+ int CEqAlarmStep::getAlarmState() const {
+ return m_nAlarmState;
+ }
+
+ void CEqAlarmStep::setAlarmState(int nAlarmState) {
+ m_nAlarmState = nAlarmState;
+ }
+
+ // 获取和设置 UnitId
+ int CEqAlarmStep::getUnitId() const {
+ return m_nUnitId;
+ }
+
+ void CEqAlarmStep::setUnitId(int nUnitId) {
+ m_nUnitId = nUnitId;
+ }
+
+ // 获取和设置 AlarmLevel
+ int CEqAlarmStep::getAlarmLevel() const {
+ return m_nAlarmLevel;
+ }
+
+ void CEqAlarmStep::setAlarmLevel(int nAlarmLevel) {
+ m_nAlarmLevel = nAlarmLevel;
+ }
+
+ // 获取和设置 AlarmCode
+ int CEqAlarmStep::getAlarmCode() const {
+ return m_nAlarmCode;
+ }
+
+ void CEqAlarmStep::setAlarmCode(int nAlarmCode) {
+ m_nAlarmCode = nAlarmCode;
+ }
+
+ // 获取和设置 AlarmId
+ int CEqAlarmStep::getAlarmId() const {
+ return m_nAlarmId;
+ }
+
+ void CEqAlarmStep::setAlarmId(int nAlarmId) {
+ m_nAlarmId = nAlarmId;
+ }
+
+ // 获取和设置 Text
+ std::string CEqAlarmStep::getText() const {
+ return m_strText;
+ }
+
+ void CEqAlarmStep::setText(const std::string& strText) {
+ m_strText = strText;
+ }
+
+ // 获取和设置 Description
+ std::string CEqAlarmStep::getDescription() const {
+ return m_strDescription;
+ }
+
+ void CEqAlarmStep::setDescription(const std::string& strDescription) {
+ m_strDescription = strDescription;
+ }
}
--
Gitblit v1.9.3