From 11260184c3c930d0d9ccd6b65e905c7828efd3cf Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 12 九月 2025 09:44:02 +0800
Subject: [PATCH] 1. 优化报警的查询功能 2. 插入设备表数据和单元表数据 3. 修复报警查询失败的问题

---
 SourceCode/Bond/BondEq/Alarm.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/BondEq/Alarm.cpp b/SourceCode/Bond/BondEq/Alarm.cpp
index 266e4ca..ef82a47 100644
--- a/SourceCode/Bond/BondEq/Alarm.cpp
+++ b/SourceCode/Bond/BondEq/Alarm.cpp
@@ -107,22 +107,24 @@
 	if (ar.IsStoring())
 	{
 		Lock();
+		ar << m_nUnitId;
+		ar << m_nId;
+		ar << m_nLevel;
 		ar << m_timeOn;
 		ar << m_timeOff;
 		ar << m_nStatus;
-		ar << m_nId;
-		ar << m_nLevel;
 		WriteString(ar, m_strText);
 		Unlock();
 	}
 	else
 	{
 		Lock();
+		ar >> m_nUnitId;
+		ar >> m_nId;
+		ar >> m_nLevel;
 		ar >> m_timeOn;
 		ar >> m_timeOff;
 		ar >> m_nStatus;
-		ar >> m_nId;
-		ar >> m_nLevel;
 		ReadString(ar, m_strText);
 		Unlock();
 	}

--
Gitblit v1.9.3