From 55a565f976ebf4dc6066215efa886812fcea8d77 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 28 三月 2025 17:10:49 +0800
Subject: [PATCH] 1.修复CEqProcessStep中解释GlassID的问题； 2.新文档；

---
 SourceCode/Bond/Servo/Model.cpp |  100 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 99 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 8d621b0..a757adc 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()
@@ -33,7 +36,7 @@
 	m_configuration.getUnitId(strUnitId);
 
 	// 机器型号和软件版本号应从配置中读取，当前先固定值
-	CString strModeType = _T("Bond2860");
+	CString strModeType = _T("Master");
 	CString strSoftRev = _T("1.0.2");
 
 
@@ -89,6 +92,94 @@
 	m_hsmsPassive.init(this, "APP", 7000);
 
 
+	SERVO::MasterListener masterListener;
+	masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
+		LOGI("<CModel>Equipment onAlive:%s(%s).\n", pEquipment->getName().c_str(),
+			bAlive ? _T("ON") : _T("OFF"));
+		notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);
+
+	};
+	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 = [&](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);
+
+
+	// master 设置缓存文件
+	CString strMasterDataFile;
+	strMasterDataFile.Format(_T("%s\\Master.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+	m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);
+
+
+	// 加载警告信息
+	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;
 }
 
@@ -96,6 +187,8 @@
 {
 	m_hsmsPassive.term();
 	CLog::GetLog()->SetOnLogCallback(nullptr);
+	m_master.term();
+
 	return 0;
 }
 
@@ -303,3 +396,8 @@
 
 	return 0;
 }
+
+bool CModel::isAlarmStep(SERVO::CStep* pStep)
+{
+	return CToolUnits::startsWith(pStep->getName(), STEP_ALARM_START);
+}

--
Gitblit v1.9.3