告警通知添加dev_name参数

core/alarm_plan.py

@@ -182,6 +182,7 @@ class AlarmPlan:
                  plan_uuid: str,
                  name: str,
                  dev_id: str,
+                 dev_name: str,
                  enable: bool,
                  time_plan: TimePlan,
                  rect: list,
@@ -195,6 +196,7 @@ class AlarmPlan:
         self.plan_uuid_     = plan_uuid     # 计划id
         self.name_          = name          # 计划名称
         self.dev_id_        = dev_id        # 设备id
+        self.dev_name_      = dev_name      # 设备名称
         self.enable_        = enable        # 是否启用
         self.time_plan_     = time_plan     # 时间计划
         self.param_         = param         # 参数
@@ -353,7 +355,7 @@ class AlarmPlan:
             db_req_que.put(DBRequest(sql=sqls.sql_insert_events, params=params, callback=None))
 
             # 通知
-            mqtt_send.alarm_event(dev_id, event_uuid, self.plan_uuid_, event_desc_map[self.event_type_], info, "events")
+            mqtt_send.alarm_event(dev_id, self.dev_name_, event_uuid, self.plan_uuid_, event_desc_map[self.event_type_], info, "events")
             LOGDBG(f"new event: {event_desc_map[self.event_type_]}, stay_time: {stay_time}")
 
             self.event_attr_.reset()
@@ -426,7 +428,7 @@ class AlarmPlan:
             db_req_que.put(DBRequest(sql=sqls.sql_insert_events, params=params, callback=None))
 
             # 通知
-            mqtt_send.alarm_event(dev_id, event_uuid, self.plan_uuid_, event_desc_map[self.event_type_], info, "events")
+            mqtt_send.alarm_event(dev_id, self.dev_name_, event_uuid, self.plan_uuid_, event_desc_map[self.event_type_], info, "events")
             LOGDBG(f"new event: {event_desc_map[self.event_type_]}, stay_time: {stay_time}")
 
             self.event_attr_.reset()
@@ -499,7 +501,7 @@ class AlarmPlan:
             db_req_que.put(DBRequest(sql=sqls.sql_insert_events, params=params, callback=None))
 
             # 通知
-            mqtt_send.alarm_event(dev_id, event_uuid, self.plan_uuid_, event_desc_map[self.event_type_], info, "events")
+            mqtt_send.alarm_event(dev_id, self.dev_name_, event_uuid, self.plan_uuid_, event_desc_map[self.event_type_], info, "events")
             LOGDBG(f"new event: {event_desc_map[self.event_type_]}, stay_time: {stay_time}")
 
             self.event_attr_.reset()
@@ -716,7 +718,7 @@ class AlarmPlan:
                 db_req_que.put(DBRequest(sql=sqls.sql_insert_events, params=params, callback=None))
 
                 # 通知
-                mqtt_send.alarm_event(dev_id, this_event_uuid, plan_uuid, event_desc_map[self.event_type_], last_info, "events")
+                mqtt_send.alarm_event(dev_id, self.dev_name_, this_event_uuid, plan_uuid, event_desc_map[self.event_type_], last_info, "events")
 
                 LOGINFO(f"EventAttr_ToiletingFrequency succeed")
             else:
@@ -778,7 +780,7 @@ class AlarmPlan:
                 db_req_que.put(DBRequest(sql=sqls.sql_insert_events, params=params, callback=None))
 
                 # 通知
-                mqtt_send.alarm_event(dev_id, this_event_uuid, plan_uuid, event_desc_map[self.event_type_], last_info, "events")
+                mqtt_send.alarm_event(dev_id, self.dev_name_, this_event_uuid, plan_uuid, event_desc_map[self.event_type_], last_info, "events")
 
                 LOGINFO(f"EventAttr_ToiletingFrequency succeed")
             else:
@@ -843,7 +845,7 @@ class AlarmPlan:
                 db_req_que.put(DBRequest(sql=sqls.sql_insert_events, params=params, callback=None))
 
                 # 通知
-                mqtt_send.alarm_event(dev_id, this_event_uuid, self.plan_uuid_, event_desc_map[self.event_type_], last_info, "events")
+                mqtt_send.alarm_event(dev_id, self.dev_name_, this_event_uuid, self.plan_uuid_, event_desc_map[self.event_type_], last_info, "events")
 
                 LOGINFO(f"EventAttr_ToiletingFrequency succeed")
             else:
@@ -908,7 +910,7 @@ class AlarmPlan:
                 db_req_que.put(DBRequest(sql=sqls.sql_insert_events, params=params, callback=None))
 
                 # 通知
-                mqtt_send.alarm_event(dev_id, this_event_uuid, self.plan_uuid_, event_desc_map[self.event_type_], last_info, "events")
+                mqtt_send.alarm_event(dev_id, self.dev_name_, this_event_uuid, self.plan_uuid_, event_desc_map[self.event_type_], last_info, "events")
 
                 LOGINFO(f"EventAttr_ToiletingFrequency succeed")
             else:

core/alarm_plan_manager.py

@@ -233,6 +233,7 @@ def cb_handle_query_all_alarm_plan_info(result):
                 plan_uuid: str  = row["plan_uuid"]
                 plan_name: str  = row["plan_name"]
                 dev_id: str     = row["dev_id"]
+                dev_name: str   = row["dev_name"]
                 enable: int     = bool(row["enable"])
                 # region          = row["region"]
                 # rect            = json.loads(region_to_rect(region))

db/db_sqls.py

@@ -76,11 +76,15 @@ SELECT
     atp.month_days      AS month_days,
     atp.weekdays        AS weekdays
 
+    di.dev_name         AS dev_name,    -- 设备名称
+
 FROM alarm_plan ap
 LEFT JOIN event_type et 
        ON ap.event_val = et.event_val
 LEFT JOIN alarm_time_plan atp 
        ON ap.alarm_time_plan_id = atp.id
+LEFT JOIN dev_info di
+       ON ap.dev_id = di.client_id  -- 匹配设备id
 WHERE ap.enable = 1;
 """
 

mqtt/mqtt_send.py

@@ -55,6 +55,7 @@ def send_msg(topic:str, format_json:dict, qos:int=0):
 # 告警事件
 def alarm_event(
         dev_id: str,
+        dev_name: str,
         uuid: str,
         plan_uuid: str,
         event_type: str,
@@ -62,6 +63,7 @@ def alarm_event(
         table: str):
     format_json = dict()
     format_json["dev_id"] = dev_id
+    format_json["dev_name"] = dev_name
     format_json["uuid"] = uuid
     format_json["plan_uuid"] =plan_uuid
     format_json["event_type"] = event_type