Casper преди 5 месеца
родител
ревизия
fd62438034

+ 5 - 4
sri-server-bg02/lib/MessageListenerC001.py

@@ -87,10 +87,11 @@ def method_c001(client, userdata, message):
     log_dict = json.loads(message.payload)
     log_list = [
 
-        # f"timeStamp: {methods.ts_to_string(int(log_dict.get('timeStamp')) / 1000)}",  # 时间
-        f"userID: {log_dict.get('userID')}",  # 用户id
-        f"vehicleID: {log_dict.get('vehicleID')}",  # 车id
-        f"cockpitID: {log_dict.get('cockpitID')}",  # 舱id
+        f"timeStamp: {methods.ts_to_string(int(log_dict.get('timeStamp')) / 1000)}",  # 时间
+        f"timeStamp: Cockpit/CanBus/CanId001/Cop001",  # 话题
+        # f"userID: {log_dict.get('userID')}",  # 用户id
+        # f"cockpitID: {log_dict.get('cockpitID')}",  # 舱id
+        # f"vehicleID: {log_dict.get('vehicleID')}",  # 车id
 
         f"directSwitch: {log_dict.get('basControl').get('directSwitch')}",
         f"eStop: {log_dict.get('basControl').get('eStop')}",

+ 4 - 2
sri-server-bg02/lib/MessageListenerV001.py

@@ -38,8 +38,10 @@ def method_v001(client, userdata, message):
     log_list = [
 
         f"timestamp: {methods.ts_to_string(int(log_dict.get('timestamp')) / 1000)}",  # 时间
-        f"userID: {log_dict.get('userID')}",  # 用户id
-        f"VehicleID: {log_dict.get('VehicleID')}",  # 车id
+        f"topic: Vehicle/ControlVehicle/Veh001",  # 话题
+        # f"userID: {log_dict.get('userID')}",  # 用户id
+        # f"VehicleID: {log_dict.get('VehicleID')}",  # 车id
+        # f"cockpitID: {log_dict.get('cockpitID')}",  # 舱id
 
         f"directSwitch: {log_dict.get('baseControl')[0].get('directSwitch')}",  # 前后切换
         f"eStop: {log_dict.get('baseControl')[0].get('eStop')}",  # 急停开关

+ 3 - 3
sri-server-bg02/test/SRI湛江项目mqtt接口说明-1016.md

@@ -6,8 +6,6 @@ mqtt服务端口:41883
 mqtt话题:Vehicle/ControlVehicle/Veh001
 mqtt消息注释(json字符串):
 {
-  
-  'VehicleID': 10101089,  //车id
   'baseControl': [
     {
       'directSwitch': 1,  //前后切换
@@ -22,7 +20,7 @@ mqtt消息注释(json字符串):
       'vehicleHorn': 2  //喇叭
     }
   ],  //车辆基本状态控制
-  'cockpitID': 10101073,  //舱id
+
   'driveControl': [
     {
       'accPedal': [
@@ -67,6 +65,8 @@ mqtt消息注释(json字符串):
     }
   ],
   'timestamp': '1729044838985',  //时间
+  'VehicleID': 10101089,  //车id
+  'cockpitID': 10101073,  //舱id
   'userID': 'aabbccddeeffgg'  //用户id
 }
 ~~~