From 7c35ff8d9a626f69a8a8b7de3d73dc9d73de9dd7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 10:51:32 +0800
Subject: [PATCH] 1. 解决读取报警文件错误的问题，提高兼容性（可能文件是在MacOS编辑的，导致换行符不一样）
---
SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp b/SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp
index 999e0cb..66f7ed4 100644
--- a/SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp
+++ b/SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp
@@ -236,11 +236,13 @@
void CAlarmMonitor::addAlarmToHistoryRecord(CAlarm* pAlarm)
{
// 加入数据库
+ /*
AlarmManager::getInstance().addAlarm(
std::to_string(pAlarm->getId()).c_str(),
getAlarmText(pAlarm->getId()),
CToolUnits::timeToString2(pAlarm->getOnTime()).c_str(),
CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
+ */
}
BOOL CAlarmMonitor::addAlarming(CAlarm* pAlarm)
--
Gitblit v1.9.3