From bf55b2f3083cbfdeb83611b2fa2dd552bf5b0775 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 03 三月 2025 16:20:00 +0800
Subject: [PATCH] 1.开始处理Step属性值； 2.增加左侧master面板；
---
SourceCode/Bond/Servo/Model.cpp | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 01c9708..729bf8d 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,63 @@
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) {
+ LOGE("<CAlarmDlg> 发生警告");
+ std::string startTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
+ std::string endTime = "";
+ bool result = alarmManager.addAlarm(std::to_string(pEqAlarmStep->getAlarmId()),
+ pEquipment->getName(), strAlarmText, startTime, endTime);
+ if (result) {
+ LOGI("<CAlarmDlg> Alarm added successfully!");
+ }
+ else {
+ LOGE("<CAlarmDlg> Failed to add alarm.");
+ }
+ }
+ else {
+ LOGE("<CAlarmDlg> i消除警告");
+ //alarmManager.updateAlarmEndTime(std::to_string(pEqAlarmStep->getAlarmId()),
+ // pEquipment->getName());
+ }
+
+ 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 +376,8 @@
return 0;
}
+
+bool CModel::isAlarmStep(SERVO::CStep* pStep)
+{
+ return CToolUnits::startsWith(pStep->getName(), STEP_ALARM_START);
+}
--
Gitblit v1.9.3