|
@@ -102,7 +102,6 @@ if __name__ == '__main__':
|
|
|
for obj1 in oss2.ObjectIterator(bucket, prefix=key1):
|
|
for obj1 in oss2.ObjectIterator(bucket, prefix=key1):
|
|
|
# 获取合并后的包
|
|
# 获取合并后的包
|
|
|
merged_bag_object_key = str(obj1.key)
|
|
merged_bag_object_key = str(obj1.key)
|
|
|
- # print(f'判断1{merged_bag_object_key}')
|
|
|
|
|
if 'data_merge' in str(obj1.key) and str(obj1.key).endswith('.bag'):
|
|
if 'data_merge' in str(obj1.key) and str(obj1.key).endswith('.bag'):
|
|
|
merged_bag_object_key_split = merged_bag_object_key.split('/')
|
|
merged_bag_object_key_split = merged_bag_object_key.split('/')
|
|
|
merged_prefix = '/'.join(merged_bag_object_key_split[:-1])
|
|
merged_prefix = '/'.join(merged_bag_object_key_split[:-1])
|
|
@@ -110,10 +109,7 @@ if __name__ == '__main__':
|
|
|
parse_prefix_full = merged_bag_object_key.replace('data_merge', 'data_parse')[:-4] + '/'
|
|
parse_prefix_full = merged_bag_object_key.replace('data_merge', 'data_parse')[:-4] + '/'
|
|
|
camera_done = False
|
|
camera_done = False
|
|
|
camera2_done = False
|
|
camera2_done = False
|
|
|
- callback_done = False
|
|
|
|
|
for obj2 in oss2.ObjectIterator(bucket, prefix=parse_prefix_full):
|
|
for obj2 in oss2.ObjectIterator(bucket, prefix=parse_prefix_full):
|
|
|
- if '/callback.json' in str(obj2.key):
|
|
|
|
|
- callback_done = True
|
|
|
|
|
if '/camera.mp4' in str(obj2.key):
|
|
if '/camera.mp4' in str(obj2.key):
|
|
|
camera_done = True
|
|
camera_done = True
|
|
|
if '/camera2.mp4' in str(obj2.key):
|
|
if '/camera2.mp4' in str(obj2.key):
|
|
@@ -121,9 +117,6 @@ if __name__ == '__main__':
|
|
|
if camera_done and camera2_done:
|
|
if camera_done and camera2_done:
|
|
|
# logging.info("存在摄像头视频: %s" % str(parse_prefix_full))
|
|
# logging.info("存在摄像头视频: %s" % str(parse_prefix_full))
|
|
|
continue
|
|
continue
|
|
|
- if not callback_done: # 不存在存在callback.json的就不处理了
|
|
|
|
|
- # logging.info("数据已回调完成，不需要处理: %s" % str(parse_prefix_full))
|
|
|
|
|
- continue
|
|
|
|
|
error_bag_list = parse_json_to_string_array(error_bag_json)
|
|
error_bag_list = parse_json_to_string_array(error_bag_json)
|
|
|
if parse_prefix_full in error_bag_list:
|
|
if parse_prefix_full in error_bag_list:
|
|
|
continue
|
|
continue
|
