commit

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

@@ -95,7 +95,6 @@ if __name__ == '__main__':
                         access_token = result_object1.get('data').get('accessToken')
                         # 要发送的JSON参数
                         try:
-                            # logging.info("bag文件为： %s", json_object['rosBagPath'])
                             old_date = json_object['dataName']
                             data_size = bucket.get_object_meta(json_object['rosBagPath']).content_length
                             equipment_no = json_object['equipmentNo']

src/python2/pjisuv/callback-pjisuv.py

@@ -61,7 +61,7 @@ if __name__ == '__main__':
                 plan_bag = False
                 control_bag = False
                 callback_json = False
-                for obj2 in oss2.ObjectIterator(bucket, prefix=prefix+ '/'):
+                for obj2 in oss2.ObjectIterator(bucket, prefix=prefix + '/'):
                     if 'callback.json' in str(obj2.key):
                         callback_json = True
                     if 'camera.mp4' in str(obj2.key):
@@ -113,17 +113,28 @@ if __name__ == '__main__':
                     logging.exception("callback报错： %s" % str(e))
                     continue
 
-                # 将时区统一
-                new_date = add_hour(old_date, 8)
+                upload = False
+                if old_date is None:
+                    upload = True
+                    old_date = ''
+                elif str(old_date).endswith('.bag'):
+                    upload = True
+                    pass
+                else:
+                    upload = False
+
                 old_delete_list = []
+                new_date = ''
                 for obj_old in oss2.ObjectIterator(bucket, prefix=old_file_path):
                     old_delete_list.append(str(obj_old.key))
                     if 'callback.json' in str(obj_old.key):
-                        if old_date is None:
+                        if upload:
                             bucket.copy_object(bucket_name, str(obj_old.key),
                                                str(obj_old.key).replace('callback.json',
                                                                         'callback_done.json'))
                         else:
+                            new_date = add_hour(old_date, 8)
+                            # 将时区统一
                             bucket.copy_object(bucket_name, str(obj_old.key),
                                                str(obj_old.key).replace(old_date, new_date).replace('callback.json',
                                                                                                     'callback_done.json'))