From 83922105a8e09cd8c1fbb5833e370518513121f7 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 14 三月 2025 10:15:29 +0800
Subject: [PATCH] 1.Equipment在面板中显示机器信息（Alive, Name, CIM State, Upstream, Downstream等）
---
SourceCode/Bond/Servo/Model.cpp | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 01c9708..114fe5d 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -2,6 +2,9 @@
#include "Model.h"
#include "Log.h"
#include "Common.h"
+#include "ToolUnits.h"
+#include "CEqAlarmStep.h"
+#include "AlarmManager.h"
CModel::CModel()
@@ -99,17 +102,77 @@
masterListener.onEqCimStateChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bOn) -> void {
LOGI("<CModel>Equipment Cim State:%s(%s).\n", pEquipment->getName().c_str(),
bOn ? _T("ON") : _T("OFF"));
+ notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);
};
- masterListener.onEqStepEvent = [&](void* pEquipment, SERVO::CStep* pStep, int code, void* pData) -> void {
- SERVO::CEquipment* p = (SERVO::CEquipment*)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());
+ }
}
};
m_master.setListener(masterListener);
+
+
+ // 加载警告信息
+ AlarmManager& alarmManager = AlarmManager::getInstance();
+ char szBuffer[MAX_PATH];
+ sprintf_s(szBuffer, MAX_PATH, "%s\\AlarmList.csv", (LPTSTR)(LPCTSTR)m_strWorkDir);
+ alarmManager.readAlarmFile(szBuffer);
+
+
return 0;
}
@@ -327,3 +390,8 @@
return 0;
}
+
+bool CModel::isAlarmStep(SERVO::CStep* pStep)
+{
+ return CToolUnits::startsWith(pStep->getName(), STEP_ALARM_START);
+}
--
Gitblit v1.9.3