From d14420e7f85b5fe7289aafe6bef0c053dede3657 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 16 一月 2026 11:20:39 +0800
Subject: [PATCH] 1.修复以下问题： CEID 校验恒通过：ceidDefined 返回 true，PauseEvent ID 不做有效性检查。Host 若下发无效 CEID，将被接受但运行时无法触发暂停，风险难以察觉。 建议的上线前防护 / 改进（无需真机也可先改） 2.软件侧警告id上抛；
---
SourceCode/Bond/Servo/Model.cpp | 78 ++++++++++++++++++++++++++++++++++++++
1 files changed, 77 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 3bc322e..61f3a80 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -37,6 +37,79 @@
m_hsmsPassive.setVariableValue("PJobSpace", (__int64)(m_master.isProcessJobsEmpty() ? 1 : 0));
}
+void CModel::notifyControlJobChanged()
+{
+ // 1) 鍒锋柊娲剧敓 SV
+ refreshDerivedSVs();
+ // 2) 閫氱煡涓婂眰 UI锛圧X_CODE_CONTROLJOB_CHANGED锛�
+ notify(RX_CODE_CONTROLJOB_CHANGED);
+}
+
+bool CModel::raiseSoftAlarm(int alarmId,
+ const std::string& desc,
+ int level /*= -1*/,
+ int deviceId /*= 0*/,
+ int unitId /*= 0*/,
+ const char* deviceName /*= "Software"*/,
+ const char* unitName /*= "App"*/)
+{
+ AlarmManager& alarmManager = AlarmManager::getInstance();
+ const AlarmInfo* info = alarmManager.getAlarmInfoByID(alarmId);
+
+ int severity = level;
+ if (severity < 0 && info != nullptr) severity = info->nAlarmLevel;
+ if (severity < 0) severity = 0;
+
+ std::string descText = desc;
+ if (descText.empty() && info != nullptr) {
+ descText = !info->strDescription.empty() ? info->strDescription : info->strAlarmText;
+ }
+ if (descText.empty()) {
+ descText = CToolUnits::formatString("Alarm %d", alarmId);
+ }
+
+ AlarmData alarmData;
+ alarmData.nId = alarmId;
+ alarmData.nSeverityLevel = severity;
+ alarmData.nDeviceId = deviceId;
+ alarmData.nUnitId = unitId;
+ alarmData.strDeviceName = deviceName;
+ alarmData.strUnitName = unitName;
+ // 鑻ユ湭鏄惧紡鎻愪緵璁惧/鍗曞厓鍚嶇О锛屽皾璇曢�氳繃 deviceId/unitId 瑙ｆ瀽锛坰oft alarm 榛樿鍧囦负 0锛�
+ if (alarmData.strDeviceName.empty()) {
+ alarmData.strDeviceName = alarmManager.getDeviceNameById(deviceId);
+ }
+ if (alarmData.strUnitName.empty()) {
+ alarmData.strUnitName = alarmManager.getUnitNameById(deviceId, unitId);
+ }
+ alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
+ alarmData.strEndTime = "";
+ alarmData.strDescription = descText;
+
+ int nAlarmEventId = 0;
+ bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
+ if (result) {
+ notify(RX_CODE_ALARM_SET);
+ if (m_master.isAlarmReportEnable()) {
+ m_hsmsPassive.requestAlarmReport(1, alarmId, descText.c_str());
+ }
+ }
+ return result;
+}
+
+void CModel::clearSoftAlarm(int alarmId, int deviceId, int unitId)
+{
+ AlarmManager& alarmManager = AlarmManager::getInstance();
+ alarmManager.clearAlarmByAttributes(alarmId, deviceId, unitId, CToolUnits::getCurrentTimeString());
+ notify(RX_CODE_ALARM_CLEAR);
+ if (m_master.isAlarmReportEnable()) {
+ const AlarmInfo* info = alarmManager.getAlarmInfoByID(alarmId);
+ std::string descText;
+ if (info != nullptr) descText = info->strAlarmText;
+ m_hsmsPassive.requestAlarmReport(0, alarmId, descText.c_str());
+ }
+}
+
void CModel::setControlState(ControlState newState)
{
const auto prev = m_currentControlState;
@@ -124,6 +197,9 @@
// CGlassPool
m_glassPool.initPool();
+
+ // 灏� Model 涓婁笅鏂囦紶閫掔粰 Master锛屼究浜� Master 瑙﹀彂杞欢绾ф姤璀︾瓑璺ㄥ眰鎿嶄綔
+ m_master.setModelCtx(this);
// Log
@@ -341,7 +417,7 @@
};
masterListener.onControlJobChanged = [this](void* pMaster) {
(void)pMaster;
- this->refreshDerivedSVs();
+ this->notifyControlJobChanged();
};
masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
LOGI("<CModel>Equipment onAlive:%s(%s).", pEquipment->getName().c_str(),
--
Gitblit v1.9.3