Forráskód Böngészése

修复sql报错的问题,增加日志

nifangxu 1 hónapja
szülő
commit
f2c596f457
2 módosított fájl, 7 hozzáadás és 5 törlés
  1. 5 5
      db/db_sqls.py
  2. 2 0
      mqtt/mqtt_recv.py

+ 5 - 5
db/db_sqls.py

@@ -78,7 +78,7 @@ SELECT
     atp.weekdays        AS weekdays,
 
     di.dev_name         AS dev_name,
-    di.tenant_id        AS tenant_id   -- 租户id
+    di.tenant_id        AS tenant_id
 
 FROM alarm_plan ap
 LEFT JOIN event_type et 
@@ -86,7 +86,7 @@ LEFT JOIN event_type et
 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
+       ON ap.dev_id = di.client_id
 WHERE
     ap.enable = 1;
 """
@@ -118,15 +118,15 @@ SELECT
     atp.month_days      AS month_days,
     atp.weekdays        AS weekdays,
 
-    di.dev_name         AS dev_name    -- 设备名称,
-    di.tenant_id        AS tenant_id   -- 租户id
+    di.dev_name         AS dev_name,
+    di.tenant_id        AS tenant_id
 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
+       ON ap.dev_id = di.client_id
 WHERE
     ap.enable = 1 AND
     ap.uuid = %(plan_uuid)s;

+ 2 - 0
mqtt/mqtt_recv.py

@@ -180,9 +180,11 @@ def deal_alarm_plan_update(msg:mqtt.MQTTMessage):
         operation   = payload.get("operation")
 
         if operation == "update":
+            LOGINFO(f"prepare to query plan: {plan_uuid}")
             g_las.g_alarm_plan_mgr.query_one_alarm_plan(plan_uuid)
             return
         elif operation == "delete":
+            LOGINFO(f"prepare to query plan: {plan_uuid}")
             g_las.g_alarm_plan_mgr.remove_one_alarm_plan(plan_uuid)
 
     except json.JSONDecodeError as e: