From 24e3d5124ed62ebd613ba883a366ea3461c9dd17 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 11 三月 2025 11:30:13 +0800
Subject: [PATCH] 1.CMFCPropertyGridCtrl控件调整，使单元项可选，不可编辑。
---
SourceCode/Bond/Servo/Model.cpp | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index da79320..114fe5d 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -124,10 +124,6 @@
}
int state = pEqAlarmStep->getAlarmState();
if (state == 1) {
- LOGE("<CAlarmDlg> 发生警告");
- std::string startTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
- std::string endTime = "2000-01-01 00:00";
-
AlarmData alarmData;
alarmData.nId = pEqAlarmStep->getAlarmId();
alarmData.nSeverityLevel = pEqAlarmStep->getAlarmLevel();
@@ -135,8 +131,8 @@
alarmData.nUnitId = pEqAlarmStep->getUnitId();
alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
- alarmData.strStartTime = startTime;
- alarmData.strEndTime = endTime;
+ alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
+ alarmData.strEndTime = "";
const AlarmInfo* alarmInfo = alarmManager.getAlarmInfoByID(alarmData.nId);
alarmData.strDescription = alarmInfo != nullptr ? alarmInfo->strAlarmText : "";
@@ -144,16 +140,20 @@
int nAlarmEventId = 0;
bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
if (result) {
- LOGI("<CAlarmDlg> Alarm added successfully!");
+ LOGI("<CModel> Alarm added successfully!");
}
else {
- LOGE("<CAlarmDlg> Failed to add alarm.");
+ LOGE("<CModel> Failed to add alarm.");
}
+
+ notifyPtr(RX_CODE_ALARM_SET, pStep);
}
else {
- LOGE("<CAlarmDlg> i消除警告");
- //alarmManager.updateAlarmEndTime(std::to_string(pEqAlarmStep->getAlarmId()),
- // pEquipment->getName());
+ alarmManager.clearAlarmByAttributes(pEqAlarmStep->getAlarmId(),
+ pEqAlarmStep->getEquipment()->getID(),
+ pEqAlarmStep->getUnitId(),
+ CToolUnits::getCurrentTimeString());
+ notifyPtr(RX_CODE_ALARM_CLEAR, pStep);
}
m_hsmsPassive.requestAlarmReport(pEqAlarmStep->getAlarmState(),
--
Gitblit v1.9.3