|
|
@@ -125,24 +125,32 @@ if __name__ == '__main__':
|
|
|
|
|
|
old_delete_list = []
|
|
|
new_date = ''
|
|
|
+ # 复制 data_parse
|
|
|
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 upload:
|
|
|
- bucket.copy_object(bucket_name, str(obj_old.key),
|
|
|
- str(obj_old.key).replace('callback.json',
|
|
|
- 'callback_done.json'))
|
|
|
- else:
|
|
|
+ if not upload:
|
|
|
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'))
|
|
|
+ else:
|
|
|
+ bucket.copy_object(bucket_name, str(obj_old.key),
|
|
|
+ str(obj_old.key).replace('callback.json',
|
|
|
+ 'callback_done.json'))
|
|
|
+
|
|
|
else:
|
|
|
- bucket.copy_object(bucket_name, str(obj_old.key), str(obj_old.key).replace(old_date, new_date))
|
|
|
- bucket.copy_object(bucket_name, old_ros_bag_path, old_ros_bag_path.replace(old_date, new_date))
|
|
|
- bucket.delete_object(old_ros_bag_path)
|
|
|
- bucket.batch_delete_objects(old_delete_list)
|
|
|
+ if not upload:
|
|
|
+ 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))
|
|
|
+
|
|
|
+ # 处理是否上传
|
|
|
+ if not upload:
|
|
|
+ bucket.copy_object(bucket_name, old_ros_bag_path, old_ros_bag_path.replace(old_date, new_date))
|
|
|
+ bucket.delete_object(old_ros_bag_path)
|
|
|
+ bucket.batch_delete_objects(old_delete_list)
|
|
|
|
|
|
if 'userId' in json_object:
|
|
|
logging.info("json_object 包含 'userId' 字段，值为:", json_object['userId'])
|
