|

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

@@ -2,6 +2,7 @@ from hub import methods, Global
 
 save_dir = r'C:\logs'  # sri内网测试环境
 
+
 async def code3001(**sources):
     """
     查询驾驶人员操作记录列表
@@ -17,121 +18,104 @@ async def code3001(**sources):
     log_file_name_list = [i.split('\\')[-1] for i in upload_file_list]
     log_file_uuid_list = [i.split('.')[0] for i in upload_file_name_list]
 
-
     # --- fill d1 ---
+    """
+    UserWorkRecordList: 用户操作记录
+    UserWorkRecordList.uuid: 记录标识
+    UserWorkRecordList.user_uuid: 用户标识
+    UserWorkRecordList.start_at: 操作开始时间
+    UserWorkRecordList.end_at: 操作结束时间
+    UserWorkRecordList.cockpit_id: 舱端id
+    UserWorkRecordList.vehicle_id: 车端id
+    """
+    d1 = list()
+    page = sources.get('page', 1)
+    size = sources.get('size', 10)
     for item in Global.mdb.get_all('UserWorkRecordList', sort_field=[('start_at', -1)]):
-        if str(item.get('_id')) not in log_file_uuid_list:
+        # --- check ---
+        uuid = str(item.get('_id'))
+        if uuid not in log_file_uuid_list:
             continue
 
+        # --- update ---
+        del item['_id']
+        item['uuid'] = uuid
+        item['user_name'] = Global.mdb.get_one_by_id('UserInfo', item.get('user_uuid')).get('name')
+        d1.append(item)
 
-    # # --- fill d1 ---
-    # """
-    # VehicleLog: 车辆日志表
-    # VehicleLog.pid: 车牌号
-    # VehicleLog.start_time_at: 远程驾驶开始时间
-    # VehicleLog.end_time_at: 远程驾驶结束时间
-    # VehicleLog.driver_name: 驾驶员
-    # VehicleLog.cockpit_name: 驾驶舱
-    # VehicleLog.create_at: 创建时间
-    # """
-    # d1 = list()
-    page = sources.get('page', 1)
-    size = sources.get('size', 10)
-    # for item in Global.mdb.get_all('VehicleInfo', sort_field=[('create_at', -1)]):
-    #
-    #     # --- check ---
-    #     if sources.get('pid') and sources.get('pid') not in item.get('pid'):
-    #         continue
-    #
-    #     # --- check ---
-    #     if sources.get('driver_name') and sources.get('driver_name') not in item.get('driver_name'):
-    #         continue
-    #
-    #     data = {
-    #         'uuid': str(item.get('_id')),
-    #         'pid': item.get('pid'),
+    # d1 = [
+    #     {
+    #         'uuid': '65dbe96949fbe311a3a01d30',
+    #         'pid': 'AA112233',  # 车牌号
+    #         'start_time_at': methods.now_ts(),
+    #         'end_time_at': methods.now_ts() + (3600 * 8),
+    #         'driver_name': '张三',
+    #         'cockpit_name': '1号舱',
+    #     }, {
+    #         'uuid': '65dbe96949fbe311a3a01d30',
+    #         'pid': 'AA112233',
     #         'start_time_at': methods.now_ts(),
-    #         'end_time_at': methods.now_ts(),
-    #         'driver_name': item.get('driver_name'),
-    #         'cockpit_name': item.get('cockpit_name'),
+    #         'end_time_at': methods.now_ts() + (3600 * 8),
+    #         'driver_name': '李四',
+    #         'cockpit_name': '1号舱',
+    #     }, {
+    #         'uuid': '65dbe96949fbe311a3a01d30',
+    #         'pid': 'AA112233',
+    #         'start_time_at': methods.now_ts(),
+    #         'end_time_at': methods.now_ts() + (3600 * 8),
+    #         'driver_name': '李四',
+    #         'cockpit_name': '1号舱',
+    #     }, {
+    #         'uuid': '65dbe96949fbe311a3a01d30',
+    #         'pid': 'AA112233',
+    #         'start_time_at': methods.now_ts(),
+    #         'end_time_at': methods.now_ts() + (3600 * 8),
+    #         'driver_name': '李四',
+    #         'cockpit_name': '1号舱',
+    #     }, {
+    #         'uuid': '65dbe96949fbe311a3a01d30',
+    #         'pid': 'AA112233',
+    #         'start_time_at': methods.now_ts(),
+    #         'end_time_at': methods.now_ts() + (3600 * 8),
+    #         'driver_name': '李四',
+    #         'cockpit_name': '1号舱',
+    #     }, {
+    #         'uuid': '65dbe96949fbe311a3a01d30',
+    #         'pid': 'AA112233',
+    #         'start_time_at': methods.now_ts(),
+    #         'end_time_at': methods.now_ts() + (3600 * 8),
+    #         'driver_name': '李四',
+    #         'cockpit_name': '1号舱',
+    #     }, {
+    #         'uuid': '65dbe96949fbe311a3a01d30',
+    #         'pid': 'AA112233',
+    #         'start_time_at': methods.now_ts(),
+    #         'end_time_at': methods.now_ts() + (3600 * 8),
+    #         'driver_name': '李四',
+    #         'cockpit_name': '1号舱',
+    #     }, {
+    #         'uuid': '65dbe96949fbe311a3a01d30',
+    #         'pid': 'AA112233',
+    #         'start_time_at': methods.now_ts(),
+    #         'end_time_at': methods.now_ts() + (3600 * 8),
+    #         'driver_name': '李四',
+    #         'cockpit_name': '1号舱',
+    #     }, {
+    #         'uuid': '65dbe96949fbe311a3a01d30',
+    #         'pid': 'AA112233',
+    #         'start_time_at': methods.now_ts(),
+    #         'end_time_at': methods.now_ts() + (3600 * 8),
+    #         'driver_name': '李四',
+    #         'cockpit_name': '1号舱',
+    #     }, {
+    #         'uuid': '65dbe96949fbe311a3a01d30',
+    #         'pid': 'AA112233',
+    #         'start_time_at': methods.now_ts(),
+    #         'end_time_at': methods.now_ts() + (3600 * 8),
+    #         'driver_name': '李四',
+    #         'cockpit_name': '1号舱',
     #     }
-    #     d1.append(data)
-    #
-    # return dict(code=0, data=d1[(page - 1) * size: page * size], total=len(d1), page=page, size=size)
-
-    d1 = [
-        {
-            'uuid': '65dbe96949fbe311a3a01d30',
-            'pid': 'AA112233',  # 车牌号
-            'start_time_at': methods.now_ts(),
-            'end_time_at': methods.now_ts() + (3600 * 8),
-            'driver_name': '张三',
-            'cockpit_name': '1号舱',
-        }, {
-            'uuid': '65dbe96949fbe311a3a01d30',
-            'pid': 'AA112233',
-            'start_time_at': methods.now_ts(),
-            'end_time_at': methods.now_ts() + (3600 * 8),
-            'driver_name': '李四',
-            'cockpit_name': '1号舱',
-        }, {
-            'uuid': '65dbe96949fbe311a3a01d30',
-            'pid': 'AA112233',
-            'start_time_at': methods.now_ts(),
-            'end_time_at': methods.now_ts() + (3600 * 8),
-            'driver_name': '李四',
-            'cockpit_name': '1号舱',
-        }, {
-            'uuid': '65dbe96949fbe311a3a01d30',
-            'pid': 'AA112233',
-            'start_time_at': methods.now_ts(),
-            'end_time_at': methods.now_ts() + (3600 * 8),
-            'driver_name': '李四',
-            'cockpit_name': '1号舱',
-        }, {
-            'uuid': '65dbe96949fbe311a3a01d30',
-            'pid': 'AA112233',
-            'start_time_at': methods.now_ts(),
-            'end_time_at': methods.now_ts() + (3600 * 8),
-            'driver_name': '李四',
-            'cockpit_name': '1号舱',
-        }, {
-            'uuid': '65dbe96949fbe311a3a01d30',
-            'pid': 'AA112233',
-            'start_time_at': methods.now_ts(),
-            'end_time_at': methods.now_ts() + (3600 * 8),
-            'driver_name': '李四',
-            'cockpit_name': '1号舱',
-        }, {
-            'uuid': '65dbe96949fbe311a3a01d30',
-            'pid': 'AA112233',
-            'start_time_at': methods.now_ts(),
-            'end_time_at': methods.now_ts() + (3600 * 8),
-            'driver_name': '李四',
-            'cockpit_name': '1号舱',
-        }, {
-            'uuid': '65dbe96949fbe311a3a01d30',
-            'pid': 'AA112233',
-            'start_time_at': methods.now_ts(),
-            'end_time_at': methods.now_ts() + (3600 * 8),
-            'driver_name': '李四',
-            'cockpit_name': '1号舱',
-        }, {
-            'uuid': '65dbe96949fbe311a3a01d30',
-            'pid': 'AA112233',
-            'start_time_at': methods.now_ts(),
-            'end_time_at': methods.now_ts() + (3600 * 8),
-            'driver_name': '李四',
-            'cockpit_name': '1号舱',
-        }, {
-            'uuid': '65dbe96949fbe311a3a01d30',
-            'pid': 'AA112233',
-            'start_time_at': methods.now_ts(),
-            'end_time_at': methods.now_ts() + (3600 * 8),
-            'driver_name': '李四',
-            'cockpit_name': '1号舱',
-        }
-    ]
+    # ]
     return dict(code=0, data=d1[(page - 1) * size: page * size], total=len(d1), page=page, size=size)
 
 

sri-server-bg02/lib/MessageListenerC001.py

@@ -84,7 +84,9 @@ def method_c001(client, userdata, message):
     log_dict = json.loads(message.payload)
     log_time = int(log_dict.get('timeStamp')) / 1000
     user_uuid = log_dict.get('userID')
-    log_uuid = UserWorkRecord.get_log_uuid(user_uuid, log_time)
+    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 = [
 
         f"timeStamp: {methods.ts_to_string(log_time)}",  # 时间

sri-server-bg02/lib/MessageListenerV001.py

@@ -34,7 +34,9 @@ def method_v001(client, userdata, message):
     log_dict = json.loads(message.payload)
     log_time = int(log_dict.get('timestamp')) / 1000
     user_uuid = log_dict.get('userID')
-    log_uuid = UserWorkRecord.get_log_uuid(user_uuid, log_time)
+    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 = [
 
         f"timestamp: {methods.ts_to_string(log_time)}",  # 时间

sri-server-bg02/lib/UserWorkRecord.py

@@ -27,13 +27,15 @@ class UserWorkRecord(object):
                 continue
 
     @classmethod
-    def get_log_uuid(cls, user_uuid, log_time):
+    def get_log_uuid(cls, user_uuid, log_time, vehicle_id, cockpit_id):
         """
         UserWorkRecordList: 用户操作记录
         UserWorkRecordList.uuid: 记录标识
         UserWorkRecordList.user_uuid: 用户标识
         UserWorkRecordList.start_at: 操作开始时间
         UserWorkRecordList.end_at: 操作结束时间
+        UserWorkRecordList.cockpit_id: 舱端id
+        UserWorkRecordList.vehicle_id: 车端id
         """
         # --- check ---
         if not user_uuid or not log_time:
@@ -48,6 +50,8 @@ class UserWorkRecord(object):
                 'user_uuid': user_uuid,
                 'start_at': log_time,
                 'end_at': log_time,
+                'vehicle_id': vehicle_id,
+                'cockpit_id': cockpit_id,
             }
             log_uuid = Global.mdb.add('UserWorkRecordList', data)