修复bug：数据库回调报错

LAS.py

@@ -26,7 +26,6 @@ from device.dev_mng import (
     Device, g_dev_mgr, init_dev_mng
 )
 
-
 import core.alarm_plan_manager as ap_mgr
 from core.alarm_plan_manager import (
     AlarmPlanManager,

core/alarm_plan.py

@@ -1029,7 +1029,7 @@ class AlarmPlan:
 
 
 
-    # 如厕频次统计回调
+    # 卫生间频次统计回调
     def cb_bathroom_stay_frequency(self, result, userdata):
         try:
             if result:

core/alarm_plan_manager.py

@@ -78,15 +78,20 @@ class AlarmPlanManager:
         with self.lock_:
             return list(self.alarm_plan_cron_map_.values())
 
-    def remove_one_plan(self, plan_uuid: str) -> bool:
+    def remove_one_alarm_plan(self, plan_uuid: str) -> bool:
         with self.lock_:
             removed = False
             if plan_uuid in self.alarm_plan_map_:
+                plan_name = self.alarm_plan_map_[plan_uuid]
                 del self.alarm_plan_map_[plan_uuid]
                 removed = True
+            LOGINFO(f"create new alarm_plan: {plan_uuid}, {plan_name}")
+
             if plan_uuid in self.alarm_plan_cron_map_:
+                plan_name = self.alarm_plan_map_[plan_uuid]
                 del self.alarm_plan_cron_map_[plan_uuid]
                 removed = True
+            LOGINFO(f"create new alarm_plan: {plan_uuid}, {plan_name}")
             return removed
 
 
@@ -164,16 +169,15 @@ class AlarmPlanManager:
         params = {
             "plan_uuid": plan_uuid
         }
-
         db_req_que.put(DBRequest(sql=sqls.sql_query_one_alarm_plan, params=params,
                                  callback=self.cb_query_one_alarm_plan))
 
 
-# 如厕频次统计回调
-    def cb_query_one_alarm_plan(self, result):
+# 查询单条告警计划
+    def cb_query_one_alarm_plan(self, result, userdata):
         try:
             if not result:
-                LOGDBG("cb_handle_query_all_alarm_plan_info, invalid result")
+                LOGDBG("cb_query_one_alarm_plan, invalid result")
 
             for row in result:
                 plan_uuid: str  = row["plan_uuid"]
@@ -242,7 +246,7 @@ class AlarmPlanManager:
                     self.push(plan_uuid, alarm_plan)
                 else:
                     self.push_cron(plan_uuid, alarm_plan)
-            LOGDBG(f"cb_handle_query_all_alarm_plan_info succeed")
+            LOGINFO(f"create new alarm_plan: {plan_uuid}, {plan_name}")
 
         except json.JSONDecodeError as e:
             tb_info = traceback.extract_tb(e.__traceback__)

core/alarm_type.py

@@ -1,13 +0,0 @@
-from enum import Enum
-
-# 告警类型
-class MSG_TYPE(Enum):
-    MSG_DEV_STATUS          = 0     # 设备状态变更
-    MSG_DEV_RAW_POINTS      = 1     # 实时点云
-    MSG_REALTIME_TARGET     = 2     # 实时目标位置
-    MSG_EVENT_FALL          = 3     # 跌倒事件
-    MSG_EVENT_EXIST         = 4     # 存在事件
-    MSG_ALARM_EVENT         = 5     # 告警事件
-
-
-

core/g_LAS.py

@@ -4,4 +4,4 @@
 
 # 全局变量
 g_alarm_plan_mgr    = None  # 告警计划管理器
-g_alarm_plan_disp  = None  # 告警计划分发器
+g_alarm_plan_disp   = None  # 告警计划分发器

mqtt/mqtt_recv.py

@@ -64,7 +64,7 @@ def check_topic(topic:str, pattern:str) -> bool:
     ]
 }
 """
-# 处理来自设备的点云消息： /dev/{device_id}/dsp_data
+# 处理来自设备的实时消息： /dev/{device_id}/dsp_data
 def deal_dsp_data(msg:mqtt.MQTTMessage):
     try:
         parts = msg.topic.split('/')
@@ -134,7 +134,7 @@ def deal_realtime_pos(msg:mqtt.MQTTMessage):
             LOGERR(f"[{frame.filename}:{frame.lineno}] @{frame.name}(), error: {e}")
 
 
-# 告警计划更新
+# 告警计划变更
 def deal_alarm_plan_update(msg:mqtt.MQTTMessage):
     try:
         payload = json.loads(msg.payload.decode('utf-8'))
@@ -145,7 +145,7 @@ def deal_alarm_plan_update(msg:mqtt.MQTTMessage):
             g_las.g_alarm_plan_mgr.query_one_alarm_plan(plan_uuid)
             return
         elif operation == "delete":
-            g_las.g_alarm_plan_mgr.remove_one_plan(plan_uuid)
+            g_las.g_alarm_plan_mgr.remove_one_alarm_plan(plan_uuid)
 
     except json.JSONDecodeError as e:
         tb_info = traceback.extract_tb(e.__traceback__)
@@ -222,7 +222,7 @@ def deal_las_msg(client:mqtt.Client, userdaata, msg:mqtt.MQTTMessage):
         topic = msg.topic
         parts = msg.topic.split('/')
 
-        # 实时位置姿态
+        # 告警计划变更
         if (check_topic(topic,Topic_Pattern.las_alarm_plan_update)):
             deal_alarm_plan_update(msg)