From 11260184c3c930d0d9ccd6b65e905c7828efd3cf Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 12 九月 2025 09:44:02 +0800
Subject: [PATCH] 1. 优化报警的查询功能 2. 插入设备表数据和单元表数据 3. 修复报警查询失败的问题
---
SourceCode/Bond/Servo/CEqAlarmStep.cpp | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.cpp b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
index db6f707..63adada 100644
--- a/SourceCode/Bond/Servo/CEqAlarmStep.cpp
+++ b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
@@ -24,20 +24,21 @@
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
attrubutes.addAttribute(new CAttribute("Alarm State",
- std::to_string(m_nAlarmState).c_str(), ""));
+ std::to_string(m_nAlarmState).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Unit ID",
- std::to_string(m_nUnitId).c_str(), ""));
+ std::to_string(m_nUnitId).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Alarm Level",
- std::to_string(m_nAlarmLevel).c_str(), ""));
+ std::to_string(m_nAlarmLevel).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Alarm Code",
- std::to_string(m_nAlarmCode).c_str(), ""));
+ std::to_string(m_nAlarmCode).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Alarm ID",
- std::to_string(m_nAlarmId).c_str(), ""));
+ std::to_string(m_nAlarmId).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Text",
- m_strText.c_str(), ""));
+ m_strText.c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Description",
- m_strDescription.c_str(), ""));
+ m_strDescription.c_str(), "", weight++));
}
int CEqAlarmStep::onReadData()
@@ -57,7 +58,7 @@
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",
+ LOGE("<CEqAlarmStep> Equipment Alarm state Changed<State:%d, Unit:%d, Level:%d, Code:%d, ID:%d>",
m_nAlarmState, m_nUnitId, m_nAlarmLevel, m_nAlarmCode, m_nAlarmId,
m_strText.c_str(), m_strDescription.c_str());
@@ -67,7 +68,7 @@
int CEqAlarmStep::onComplete()
{
CReadStep::onComplete();
- LOGI("<CEqAlarmStep> onComplete.");
+ LOGD("<CEqAlarmStep> onComplete.");
return 0;
}
@@ -75,7 +76,7 @@
int CEqAlarmStep::onTimeout()
{
CReadStep::onTimeout();
- LOGI("<CEqAlarmStep> onTimeout.");
+ LOGE("<CEqAlarmStep> onTimeout.");
return 0;
}
--
Gitblit v1.9.3