|

sri-server-bg01/api/api.py

@@ -182,8 +182,9 @@ async def download(request: Request, response: Response, tag: str):
     try:
         # --- get ---
         params = request.query_params
-        # methods.debug_log('api.download.236', f"#params: {params}")
-        method = _get_method_by_code(code=params.get('code'), tag=tag)
+        # methods.debug_log('api.download|185', f"#code: {params.get('code')} | {type(params.get('code'))}")
+        # methods.debug_log('api.download|185', f"#tag: {tag}")
+        method = _get_method_by_code(code=int(params.get('code')), tag=tag)
         result = await method(**params)
 
         # --- 是否弹框 ---

sri-server-bg01/api/v6/code3000.py

@@ -137,6 +137,6 @@ async def code3002(**sources):
     """
     下载指定驾驶人员操作日志
     """
-    file_name = '2024-03-04.log'
+    file_name = '671754598302fc6fd344819f.log'
     file_path = f"/home/server/logs/{file_name}"
     return {'file_path': file_path, 'file_name': file_name}

sri-server-bg02/lib/MessageListener.py

@@ -28,7 +28,7 @@ class MessageListener(object):
 
         thread_list = [
             threading.Thread(target=subscribe_c001),
-            # threading.Thread(target=subscribe_v001),
+            threading.Thread(target=subscribe_v001),
         ]
         for thread in thread_list:
             thread.setDaemon(True)

sri-server-bg02/lib/MessageListenerC001.py

@@ -72,7 +72,7 @@ def method_c001(client, userdata, message):
     }
     """
     # --- print ---
-    methods.debug_log(f"method_c001|75", f"#message.payload: {message.payload}")
+    # methods.debug_log(f"method_c001|75", f"#message.payload: {message.payload}")
     # log_dict = json.loads(message.payload)
     # try:
     #     log_dict = json.loads(message.payload)

sri-server-bg02/lib/MessageListenerV001.py

@@ -1,6 +1,7 @@
 from hub import methods, Global
 
 import threading
+import traceback
 import time
 import json
 import os
@@ -30,12 +31,20 @@ def method_v001(client, userdata, message):
     #     out = methods.run_command(f'mkdir -p {save_dir}', callback=True)
     #     methods.debug_log('MessageListener46', f"#out: {out}")
 
+    # --- check ---
+    try:
+        log_dict = json.loads(message.payload)
+        log_time = int(log_dict.get('timestamp')) / 1000
+        user_uuid = log_dict.get('userID')
+        vehicle_id = log_dict.get('VehicleID')
+        cockpit_id = log_dict.get('cockpitID')
+    except Exception as exception:
+        methods.debug_log("method_v001|41", f"#message.payload: {message.payload}")
+        methods.debug_log("method_v001|41", f"#exception: {exception.__class__.__name__}")
+        methods.debug_log("method_v001|41", f"#traceback: {traceback.format_exc()}")
+        return
+
     # --- fill log_list ---
-    log_dict = json.loads(message.payload)
-    log_time = int(log_dict.get('timestamp')) / 1000
-    user_uuid = log_dict.get('userID')
-    vehicle_id = log_dict.get('VehicleID')
-    cockpit_id = log_dict.get('cockpitID')
     log_uuid = UserWorkRecord.get_log_uuid(user_uuid, log_time, vehicle_id, cockpit_id)
     log_list = [