From 469bf4af5180cdee2808b595e2d48d6266992235 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 16:10:29 +0800
Subject: [PATCH] 1.调整报警窗口
---
SourceCode/Bond/Servo/Model.cpp | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 5dce62e..2429f3a 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,14 +140,13 @@
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.");
}
}
else {
- LOGE("<CAlarmDlg> i消除警告");
alarmManager.clearAlarmByAttributes(pEqAlarmStep->getAlarmId(),
pEqAlarmStep->getEquipment()->getID(),
pEqAlarmStep->getUnitId(),
--
Gitblit v1.9.3