Browse Source

#IQRV #comment 去除废弃的调用

80374374 2 months ago
parent
commit
498825e40a
3 changed files with 4 additions and 53 deletions
  1. 4 4
      Framework/spbase/StartUpBase.cpp
  2. 0 14
      Module/mod_alarm/Alarm.h
  3. 0 35
      Module/mod_alarm/AlarmFSM.h

+ 4 - 4
Framework/spbase/StartUpBase.cpp

@@ -43,7 +43,7 @@ public:
 
     static StartupLogManager& getInstance();
     //StartupLogManager::getInstance().addLog(entityName, entity_id);
-    void addLog(const std::string& module_entity, int idx); // 新增 addLog 方法
+    void addLog(const std::string& module_entity, int idx); // 鏂板� addLog 鏂规硶
     bool checkLogExist(int idx);
     StartupLog& getLog(int idx);
     /*
@@ -193,13 +193,13 @@ StartupLogManager::~StartupLogManager() {}
 void StartupLogManager::addLog(const std::string& module_entity, int idx) {
     recordStartTime();
     if (logs_.find(idx) == logs_.end()) {
-        logs_[idx] = StartupLog(module_entity, idx); // 直接拷贝 log 对象
-    } // 如果已存在,则忽略
+        logs_[idx] = StartupLog(module_entity, idx); // 鐩存帴鎷疯礉 log 瀵硅薄
+    } // 濡傛灉宸插瓨鍦�紝鍒欏拷鐣�
 }
 
 StartupLog& StartupLogManager::getLog(int idx) {
     if (logs_.find(idx) == logs_.end()) {
-        logs_[idx] = StartupLog("", idx); // 仍然保留隐式创建的逻辑,方便使用
+        logs_[idx] = StartupLog("", idx); // 浠嶇劧淇濈暀闅愬紡鍒涘缓鐨勯€昏緫锛屾柟渚夸娇鐢�
     }
     return logs_[idx];
 }

+ 0 - 14
Module/mod_alarm/Alarm.h

@@ -4,7 +4,6 @@
 #include <list.h>
 
 typedef struct alarm_t alarm_t;
-typedef struct alarm_state_t alarm_state_t;
 typedef struct alarmUpgraded_t alarmUpgraded_t;
 
 struct alarm_t 
@@ -33,19 +32,6 @@ struct alarmUpgraded_t
 	time_t time;
 };
 
-struct alarm_state_t 
-{
-#ifdef RVC_OS_WIN
-	unsigned __int64 SN;
-#else
-    unsigned long long SN;
-#endif
-	unsigned long LifeID;
-	unsigned long Item;
-	char Level;
-	char*Description;
-};
-
 static void add_new_alarm(alarm_t*new_alrm,list_head*list)
 {
 	list_add_tail(&new_alrm->entry, list);

+ 0 - 35
Module/mod_alarm/AlarmFSM.h

@@ -27,44 +27,11 @@
 
 #pragma pack(1)
 const int UPLOG_MAX_COUNT = 500;//队列长度
-//[StructName("ALARMUPLOAD")]
-struct AlarmUpload
-{
-	char TerminalNo[16];
-	char EntityName[32];
-	char SN[20];
-#ifdef RVC_OS_WIN
-	unsigned long  LifeID;
-	unsigned long Item;
-	unsigned long UserCode;
-#else 
-	uint32_t  LifeID;
-	uint32_t Item;
-	uint32_t UserCode;
-#endif
-	char Level;
-	char Description[512];
-};
-
 //[StructName("ALARMANS")]
 struct AlarmReply
 {
 	int ResultCode;
 };
-// [StructName("ALARMSTATE")]
-struct AlarmStateUpload
-{
-	char TerminalNo[16];
-#ifdef RVC_OS_WIN
-	unsigned __int64 SN;
-#else
-	unsigned long long SN;
-#endif
-	unsigned long  LifeID;
-	unsigned long Item;
-	char Level;
-	char Description[512];
-};
 
 //[StructName("ALARMSTATEANS")]
 struct AlarmStateReply
@@ -72,7 +39,6 @@ struct AlarmStateReply
 	int ResultCode;
 };
 
-
 #pragma pack()
 
 enum AlarmCtlCode
@@ -215,7 +181,6 @@ private:
 
 	struct list_head m_uploading_alarm; 
 	struct list_head m_uploaded_alarm; 
-	alarm_state_t m_uploading_alarmstate;
 
 	CSimpleStringA m_terminalNo;
 	int m_nDealWarningTime;