From 8eee0a06c608281c6bb437b9481c0976aaaabe98 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 27 二月 2025 17:52:37 +0800
Subject: [PATCH] 1.添加CEqProcessStep

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

diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index c4e39d0..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()
@@ -57,9 +60,104 @@
 	});
 
 
+	SECSListener listener;
+	listener.onEQOffLine = [&](void* pFrom) -> void {
+		LOGI("远程请求OffLine");
+	};
+	listener.onEQOnLine = [&](void* pFrom) -> void {
+		LOGI("远程请求OnLine");
+	};
+	listener.onCommand = [&](void* pFrom, const char* pszName, std::vector<CommandParameter>& params) -> void {
+		LOGI("onCommand:%s", pszName);
+		for (auto& item : params) {
+			LOGI("param:%s,%s", item.szName, item.szValue);
+		}
+	};
+	listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
+		// 在此填充常量值，目前仅是加1后返回
+		for (auto& item : eqcs) {
+			sprintf_s(item.szValue, 256, "Test%d", item.id+1);
+		}
+	};
+	listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
+		// 在此保存和设置机器常量值
+		for (auto& item : eqcs) {
+			LOGI("onEQConstantRequest: %d, %s", item.id, item.szValue);
+		}
+	};
+
+	m_hsmsPassive.setListener(listener);
 	m_hsmsPassive.setEquipmentModelType((LPTSTR)(LPCTSTR)strModeType);
 	m_hsmsPassive.setSoftRev((LPTSTR)(LPCTSTR)strSoftRev);
 	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) {
+					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;
@@ -69,6 +167,8 @@
 {
 	m_hsmsPassive.term();
 	CLog::GetLog()->SetOnLogCallback(nullptr);
+	m_master.term();
+
 	return 0;
 }
 
@@ -276,3 +376,8 @@
 
 	return 0;
 }
+
+bool CModel::isAlarmStep(SERVO::CStep* pStep)
+{
+	return CToolUnits::startsWith(pStep->getName(), STEP_ALARM_START);
+}

--
Gitblit v1.9.3