From 2af991c1c72211b3b6b7fda703846bc017bc1908 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 11:25:33 +0800
Subject: [PATCH] 1.修复上一次合并代码遗留问题；
---
SourceCode/Bond/Servo/AlarmDlg.cpp | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/AlarmDlg.cpp b/SourceCode/Bond/Servo/AlarmDlg.cpp
index 6fc3e88..f12426f 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.cpp
+++ b/SourceCode/Bond/Servo/AlarmDlg.cpp
@@ -5,6 +5,7 @@
#include "Servo.h"
#include "afxdialogex.h"
#include "AlarmDlg.h"
+#include "AlarmManager.h"
#include "Common.h"
#include <iomanip>
@@ -65,13 +66,15 @@
AlarmData alarmData;
alarmData.nId = pStep->getAlarmId();
alarmData.nSeverityLevel = pStep->getAlarmLevel();
- alarmData.nDeviceId = pStep->getAlarmDev();
+ alarmData.nDeviceId = pStep->getEquipment()->getID();
alarmData.nUnitId = pStep->getUnitId();
alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
- alarmData.strDescription = pStep->getText();
alarmData.strStartTime = getCurrentTimeString();
alarmData.strEndTime = "2000-01-01 00:00";
+
+ const AlarmInfo* pAlarmInfo = alarmManager.getAlarmInfoByID(pStep->getAlarmId());
+ alarmData.strDescription = pAlarmInfo != nullptr ? pAlarmInfo->strAlarmText : "";
// 鎻掑叆鍒楄〃鎺т欢
CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
@@ -84,13 +87,14 @@
bool result = alarmManager.addAlarm(alarmData, alarmEventId);
if (result) {
LOGI("<CAlarmDlg> Alarm added successfully!");
- }
+ }
else {
LOGI("<CAlarmDlg> Failed to add alarm.");
- }
- }
}
}
+ }
+ }
+
pAny->release();
}, [&]() -> void {
@@ -471,4 +475,4 @@
// 鐐瑰嚮涓嬩竴椤�
m_nCurPage++;
UpdatePageData(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3