commit

src/python2/pjibot/callback-pjibot.py

@@ -144,15 +144,29 @@ if __name__ == '__main__':
                         # bucket.delete_object(old_ros_bag_path)
                         # bucket.batch_delete_objects(old_delete_list)
 
-                        data2 = {
-                            "dataName": new_date,
-                            "dataSize": data_size,
-                            "equipmentNo": equipment_no,
-                            "filePath": old_file_path.replace(old_date, new_date),
-                            "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
-                            "taskId": task_id,
-                            "triggerId": trigger_id
-                        }
+                        if 'userId' in json_object:
+                            logging.info("json_object 包含 'userId' 字段，值为:", json_object['userId'])
+                            data2 = {
+                                'userId': json_object['userId'],
+                                "dataName": new_date,
+                                "dataSize": data_size,
+                                "equipmentNo": equipment_no,
+                                "filePath": old_file_path.replace(old_date, new_date),
+                                "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
+                                "taskId": task_id,
+                                "triggerId": trigger_id
+                            }
+                        else:
+                            logging.info("json_object 不包含 'userId' 字段")
+                            data2 = {
+                                "dataName": new_date,
+                                "dataSize": data_size,
+                                "equipmentNo": equipment_no,
+                                "filePath": old_file_path.replace(old_date, new_date),
+                                "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
+                                "taskId": task_id,
+                                "triggerId": trigger_id
+                            }
                         json_data2 = json.dumps(data2)
                         logging.info("回调接口请求中：%s" % url2_private)
                         request2 = urllib2.Request(url2_private, json_data2,

src/python2/pjibot_delivery/2callback-pjibot_delivery.py

@@ -128,15 +128,30 @@ if __name__ == '__main__':
                         # bucket.delete_object(old_ros_bag_path)
                         # bucket.batch_delete_objects(old_delete_list)
 
-                        data2 = {
-                            "dataName": new_date,
-                            "dataSize": data_size,
-                            "equipmentNo": equipment_no,
-                            "filePath": old_file_path.replace(old_date, new_date),
-                            "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
-                            "taskId": task_id,
-                            "triggerId": trigger_id
-                        }
+                        if 'userId' in json_object:
+                            logging.info("json_object 包含 'userId' 字段，值为:", json_object['userId'])
+                            data2 = {
+                                'userId': json_object['userId'],
+                                "dataName": new_date,
+                                "dataSize": data_size,
+                                "equipmentNo": equipment_no,
+                                "filePath": old_file_path.replace(old_date, new_date),
+                                "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
+                                "taskId": task_id,
+                                "triggerId": trigger_id
+                            }
+                        else:
+                            logging.info("json_object 不包含 'userId' 字段")
+                            data2 = {
+                                "dataName": new_date,
+                                "dataSize": data_size,
+                                "equipmentNo": equipment_no,
+                                "filePath": old_file_path.replace(old_date, new_date),
+                                "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
+                                "taskId": task_id,
+                                "triggerId": trigger_id
+                            }
+
                         json_data2 = json.dumps(data2)
                         logging.info("回调接口请求中：%s" % url2_private)
                         request2 = urllib2.Request(url2_private, json_data2,

src/python2/pjibot_delivery/callback-pjibot_delivery.py

@@ -128,15 +128,29 @@ if __name__ == '__main__':
                         # bucket.delete_object(old_ros_bag_path)
                         # bucket.batch_delete_objects(old_delete_list)
 
-                        data2 = {
-                            "dataName": new_date,
-                            "dataSize": data_size,
-                            "equipmentNo": equipment_no,
-                            "filePath": old_file_path.replace(old_date, new_date),
-                            "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
-                            "taskId": task_id,
-                            "triggerId": trigger_id
-                        }
+                        if 'userId' in json_object:
+                            logging.info("json_object 包含 'userId' 字段，值为:", json_object['userId'])
+                            data2 = {
+                                'userId': json_object['userId'],
+                                "dataName": new_date,
+                                "dataSize": data_size,
+                                "equipmentNo": equipment_no,
+                                "filePath": old_file_path.replace(old_date, new_date),
+                                "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
+                                "taskId": task_id,
+                                "triggerId": trigger_id
+                            }
+                        else:
+                            logging.info("json_object 不包含 'userId' 字段")
+                            data2 = {
+                                "dataName": new_date,
+                                "dataSize": data_size,
+                                "equipmentNo": equipment_no,
+                                "filePath": old_file_path.replace(old_date, new_date),
+                                "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
+                                "taskId": task_id,
+                                "triggerId": trigger_id
+                            }
                         json_data2 = json.dumps(data2)
                         logging.info("回调接口请求中：%s" % url2_private)
                         request2 = urllib2.Request(url2_private, json_data2,

src/python2/pjibot_patrol/callback-pjibot_patrol.py

@@ -135,15 +135,29 @@ if __name__ == '__main__':
                         # bucket.delete_object(old_ros_bag_path)
                         # bucket.batch_delete_objects(old_delete_list)
 
-                        data2 = {
-                            "dataName": new_date,
-                            "dataSize": data_size,
-                            "equipmentNo": equipment_no,
-                            "filePath": old_file_path.replace(old_date, new_date),
-                            "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
-                            "taskId": task_id,
-                            "triggerId": trigger_id
-                        }
+                        if 'userId' in json_object:
+                            logging.info("json_object 包含 'userId' 字段，值为:", json_object['userId'])
+                            data2 = {
+                                'userId': json_object['userId'],
+                                "dataName": new_date,
+                                "dataSize": data_size,
+                                "equipmentNo": equipment_no,
+                                "filePath": old_file_path.replace(old_date, new_date),
+                                "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
+                                "taskId": task_id,
+                                "triggerId": trigger_id
+                            }
+                        else:
+                            logging.info("json_object 不包含 'userId' 字段")
+                            data2 = {
+                                "dataName": new_date,
+                                "dataSize": data_size,
+                                "equipmentNo": equipment_no,
+                                "filePath": old_file_path.replace(old_date, new_date),
+                                "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
+                                "taskId": task_id,
+                                "triggerId": trigger_id
+                            }
                         json_data2 = json.dumps(data2)
                         logging.info("回调接口请求中：%s" % url2_private)
                         request2 = urllib2.Request(url2_private, json_data2,

src/python2/pjisuv/callback-pjisuv.py

@@ -133,17 +133,29 @@ if __name__ == '__main__':
                 bucket.delete_object(old_ros_bag_path)
                 bucket.batch_delete_objects(old_delete_list)
 
-                triggerId = json_object['triggerId']
-                data2 = {
-                    "dataName": new_date,
-                    "dataSize": data_size,
-                    "equipmentNo": equipment_no,
-                    "filePath": old_file_path.replace(old_date, new_date),
-                    "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
-                    "taskId": task_id,
-                    # "triggerId": ["1744180835122155522", "1744178775815360514"]
-                    "triggerId": triggerId
-                }
+                if 'userId' in json_object:
+                    logging.info("json_object 包含 'userId' 字段，值为:", json_object['userId'])
+                    data2 = {
+                        'userId': json_object['userId'],
+                        "dataName": new_date,
+                        "dataSize": data_size,
+                        "equipmentNo": equipment_no,
+                        "filePath": old_file_path.replace(old_date, new_date),
+                        "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
+                        "taskId": task_id,
+                        "triggerId": trigger_id
+                    }
+                else:
+                    logging.info("json_object 不包含 'userId' 字段")
+                    data2 = {
+                        "dataName": new_date,
+                        "dataSize": data_size,
+                        "equipmentNo": equipment_no,
+                        "filePath": old_file_path.replace(old_date, new_date),
+                        "rosBagPath": old_ros_bag_path.replace(old_date, new_date),
+                        "taskId": task_id,
+                        "triggerId": trigger_id
+                    }
                 json_data2 = json.dumps(data2)
                 logging.info("回调接口请求中：%s" % url2_private)
                 request2 = urllib2.Request(url2_private, json_data2,