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/Model.cpp | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 729bf8d..da79320 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -126,9 +126,23 @@
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);
+ std::string endTime = "2000-01-01 00:00";
+
+ 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 = startTime;
+ alarmData.strEndTime = endTime;
+
+ 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("<CAlarmDlg> Alarm added successfully!");
}
--
Gitblit v1.9.3