|
|
@@ -127,8 +127,9 @@ if __name__ == '__main__':
|
|
|
logging.exception("callback报错：%s", str(e))
|
|
|
continue
|
|
|
|
|
|
- # 将时区统一
|
|
|
- new_date = add_hour(old_date, 8)
|
|
|
+ # 将时区统一（室外不需要需要加8，根据机器人终端的时区判断）
|
|
|
+ # new_date = add_hour(old_date, 8)
|
|
|
+ new_date = old_date
|
|
|
old_delete_list = []
|
|
|
for obj_old in oss2.ObjectIterator(bucket, prefix=old_file_path):
|
|
|
old_delete_list.append(str(obj_old.key))
|
|
|
@@ -136,12 +137,14 @@ if __name__ == '__main__':
|
|
|
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(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)
|
|
|
+ bucket.delete_object(str(obj_old.key)) # 删除 callback.json
|
|
|
+ # todo 时区不变也就不需要移动文件了
|
|
|
+ # 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)
|
|
|
|
|
|
data2 = {
|
|
|
"dataName": new_date,
|
