From 31aa10eaae103c30e02d7dc6c71ff4e50de361b3 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 12 五月 2025 15:28:32 +0800
Subject: [PATCH] 1. 修改报警的显示模式（包括日志，需要后期修复） 2. 添加Release模式编译
---
SourceCode/Bond/Servo/Model.cpp | 106 ++++++++++++++++++++++------------------------------
1 files changed, 45 insertions(+), 61 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index a757adc..5dab65a 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -105,64 +105,53 @@
notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);
};
- masterListener.onEqStepEvent = [&](SERVO::CStep* pStep, int code, void* pData) -> void {
- if (code == STEP_EVENT_READDATA) {
- LOGI("<CModel>onEqStepEvent,数据变化:%s(%s, 0x%x).\n", pStep->getEquipment()->getName().c_str(),
- pStep->getName().c_str(), pData);
- notifyPtr(RX_CODE_STEP_EVENT_READDATA, pStep);
-
- // 处理警告信息
- if (isAlarmStep(pStep)) {
- // 保存到数据库
- AlarmManager& alarmManager = AlarmManager::getInstance();
- std::string strAlarmText;
- SERVO::CEquipment* pEquipment = pStep->getEquipment();
- SERVO::CEqAlarmStep* pEqAlarmStep = (SERVO::CEqAlarmStep*)pStep;
- const AlarmInfo* pAlarmInfo = alarmManager.getAlarmInfoByID(pEqAlarmStep->getAlarmId());
- if (pAlarmInfo != nullptr) {
- strAlarmText = pAlarmInfo->strAlarmText;
- }
- int state = pEqAlarmStep->getAlarmState();
- if (state == 1) {
- AlarmData alarmData;
- alarmData.nId = pEqAlarmStep->getAlarmId();
- alarmData.nSeverityLevel = pEqAlarmStep->getAlarmLevel();
- alarmData.nDeviceId = pEqAlarmStep->getEquipment()->getID();
- alarmData.nUnitId = pEqAlarmStep->getUnitId();
- alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
- alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
- alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
- alarmData.strEndTime = "";
-
- const AlarmInfo* alarmInfo = alarmManager.getAlarmInfoByID(alarmData.nId);
- alarmData.strDescription = alarmInfo != nullptr ? alarmInfo->strAlarmText : "";
-
- int nAlarmEventId = 0;
- bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
- if (result) {
- LOGI("<CModel> Alarm added successfully!");
- }
- else {
- LOGE("<CModel> Failed to add alarm.");
- }
-
- notifyPtr(RX_CODE_ALARM_SET, pStep);
- }
- else {
- alarmManager.clearAlarmByAttributes(pEqAlarmStep->getAlarmId(),
- pEqAlarmStep->getEquipment()->getID(),
- pEqAlarmStep->getUnitId(),
- CToolUnits::getCurrentTimeString());
- notifyPtr(RX_CODE_ALARM_CLEAR, pStep);
- }
-
- m_hsmsPassive.requestAlarmReport(pEqAlarmStep->getAlarmState(),
- pEquipment->getBaseAlarmId() + pEqAlarmStep->getAlarmId(),
- strAlarmText.c_str());
- }
+ masterListener.onEqAlarm = [&](void* pMaster, SERVO::CEquipment* pEquipment, int state, int alarmId, int unitId, int level) -> void {
+ AlarmManager& alarmManager = AlarmManager::getInstance();
+ std::string strAlarmText;
+ const AlarmInfo* pAlarmInfo = alarmManager.getAlarmInfoByID(alarmId);
+ if (pAlarmInfo != nullptr) {
+ strAlarmText = pAlarmInfo->strAlarmText;
}
- };
+ if (state == 1) {
+ AlarmData alarmData;
+ alarmData.nId = alarmId;
+ alarmData.nSeverityLevel = level;
+ alarmData.nDeviceId = pEquipment->getID();
+ alarmData.nUnitId = unitId;
+ alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
+ alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
+ alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
+ alarmData.strEndTime = "";
+ const AlarmInfo* alarmInfo = alarmManager.getAlarmInfoByID(alarmData.nId);
+ alarmData.strDescription = alarmInfo != nullptr ? alarmInfo->strAlarmText : "";
+
+ int nAlarmEventId = 0;
+ bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
+ if (result) {
+ LOGI("<CModel> Alarm added successfully!");
+ }
+ else {
+ LOGE("<CModel> Failed to add alarm.");
+ }
+
+ notify(RX_CODE_ALARM_SET);
+ }
+ else {
+ alarmManager.clearAlarmByAttributes(alarmId,
+ pEquipment->getID(),
+ unitId,
+ CToolUnits::getCurrentTimeString());
+ notify(RX_CODE_ALARM_CLEAR);
+ }
+
+ m_hsmsPassive.requestAlarmReport(state,
+ pEquipment->getBaseAlarmId() + alarmId,
+ strAlarmText.c_str());
+ };
+ masterListener.onEqVcrEventReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, SERVO::CVcrEventReport* pReport) {
+ LOGE("<CModel>onEqVcrEventReport.");
+ };
m_master.setListener(masterListener);
@@ -395,9 +384,4 @@
}
return 0;
-}
-
-bool CModel::isAlarmStep(SERVO::CStep* pStep)
-{
- return CToolUnits::startsWith(pStep->getName(), STEP_ALARM_START);
}
--
Gitblit v1.9.3