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.h | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/BondEq/Alarm.h b/SourceCode/Bond/BondEq/Alarm.h
index 9b3a354..12b4a26 100644
--- a/SourceCode/Bond/BondEq/Alarm.h
+++ b/SourceCode/Bond/BondEq/Alarm.h
@@ -6,14 +6,19 @@
{
public:
CAlarm();
- CAlarm(int unitId, int status, int id, int level, const char* pszText);
+ CAlarm(int id, int level, const char* pszText);
+ CAlarm(int status, int id, int level, const char* pszText);
+ CAlarm(CAlarm* pScr);
~CAlarm();
public:
virtual std::string& getClassName();
virtual std::string toString();
int getUnitId();
- ULONGLONG getTime();
+ void alarmOn();
+ void alarmOff();
+ ULONGLONG getOnTime();
+ ULONGLONG getOffTime();
int getId();
int getLevel();
int getStatus();
@@ -22,8 +27,9 @@
private:
int m_nUnitId;
- ULONG64 m_time;
- int m_nStatus;
+ ULONG64 m_timeOn;
+ ULONG64 m_timeOff;
+ int m_nStatus; // 0:未知；1:ON；2:OFF；
int m_nId;
int m_nLevel;
std::string m_strText;
--
Gitblit v1.9.3