|
|
@@ -15,6 +15,46 @@ logging.basicConfig(filename=path1 + 'log/pcd.log', level=logging.INFO,
|
|
|
key1 = 'pjibot/'
|
|
|
sleep_time = 60 # 每多少秒扫描一次
|
|
|
|
|
|
+error_bag_json = "/mnt/disk001/dcl_data_process/src/python2/pjibot/pcd-errorBag.json"
|
|
|
+def parse_json_to_string_array(file_path):
|
|
|
+ try:
|
|
|
+ # 打开并读取JSON文件（Python 2中不支持encoding参数，需要使用codecs模块或处理文件读取后的编码）
|
|
|
+ with open(file_path, 'r') as file:
|
|
|
+ # 读取文件内容
|
|
|
+ file_content = file.read()
|
|
|
+ # 解析JSON内容（Python 2中json.loads用于解析字符串）
|
|
|
+ data = json.loads(file_content.decode('utf-8')) # 假设文件是UTF-8编码，这里需要手动解码
|
|
|
+
|
|
|
+ # 检查数据是否是一个列表，并且列表中的元素是否是字符串
|
|
|
+ if isinstance(data, list):
|
|
|
+ for item in data:
|
|
|
+ if not isinstance(item, basestring): # Python 2中字符串类型包括str和unicode，用basestring检查
|
|
|
+ raise ValueError("JSON数组中的元素不是字符串")
|
|
|
+ return data
|
|
|
+ else:
|
|
|
+ return []
|
|
|
+ except Exception as e:
|
|
|
+ return []
|
|
|
+
|
|
|
+
|
|
|
+def list_to_json_file(data, file_path):
|
|
|
+ """
|
|
|
+ 将列表转换为JSON格式并写入指定的文件路径。
|
|
|
+ 如果文件已存在，则覆盖它。
|
|
|
+
|
|
|
+ 参数:
|
|
|
+ data (list): 要转换为JSON的列表。
|
|
|
+ file_path (str): 要写入JSON数据的文件路径。
|
|
|
+ """
|
|
|
+ # 将列表转换为JSON格式的字符串，并确保输出为UTF-8编码的字符串
|
|
|
+ json_data = json.dumps(data, ensure_ascii=False, indent=4)
|
|
|
+ json_data_utf8 = json_data.encode('utf-8') # 编码为UTF-8
|
|
|
+
|
|
|
+ # 以写入模式打开文件，如果文件已存在则覆盖
|
|
|
+ with open(file_path, 'w') as file:
|
|
|
+ # 将UTF-8编码的JSON字符串写入文件
|
|
|
+ file.write(json_data_utf8)
|
|
|
+
|
|
|
|
|
|
def parse_to_pcd_mp4(merged_bag_file_path, parse_prefix2, local_parse_dir, local_delete_list):
|
|
|
global bucket
|
|
|
@@ -52,24 +92,16 @@ def parse_to_pcd_mp4(merged_bag_file_path, parse_prefix2, local_parse_dir, local
|
|
|
bucket.put_object_from_file(oss_csv_object_key3, local_pcd_mp4_dir3 + '/output_video_converted.mp4')
|
|
|
logging.info("上传点云视频到: %s", oss_csv_object_key3)
|
|
|
except Exception as e:
|
|
|
+ error_bag_list = parse_json_to_string_array(error_bag_json)
|
|
|
+ error_bag_list.append(parse_prefix)
|
|
|
+ list_to_json_file(error_bag_list, error_bag_json)
|
|
|
logging.exception("生成点云视频报错: %s" % str(e))
|
|
|
- # for obj in oss2.ObjectIterator(bucket, prefix=parse_prefix2):
|
|
|
- # bucket.delete_object(obj.key)
|
|
|
|
|
|
|
|
|
-'''
|
|
|
-cname：http://open-bucket.oss.icvdc.com
|
|
|
-内网endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com
|
|
|
-oss桶名： open-bucket
|
|
|
-keyid：n8glvFGS25MrLY7j
|
|
|
-secret：xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
|
|
|
-'''
|
|
|
# ------- 获取合并之后的bag包，解析出csv -------
|
|
|
if __name__ == '__main__':
|
|
|
# 1 创建阿里云对象
|
|
|
auth = oss2.Auth('n8glvFGS25MrLY7j', 'xZ2Fozoarpfw0z28FUhtg8cu0yDc5d')
|
|
|
- # cname = 'http://open-bucket.oss.icvdc.com'
|
|
|
- # bucket = oss2.Bucket(auth, cname, 'open-bucket', is_cname=True)
|
|
|
endpoint = 'oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com'
|
|
|
bucket = oss2.Bucket(auth, endpoint, 'pji-bucket1')
|
|
|
while True:
|
|
|
@@ -92,10 +124,7 @@ if __name__ == '__main__':
|
|
|
# pcd1_done = False
|
|
|
# pcd2_done = False
|
|
|
pcd3_done = False
|
|
|
- callback_done = False
|
|
|
for obj2 in oss2.ObjectIterator(bucket, prefix=parse_prefix_full):
|
|
|
- if '/callback.json' in str(obj2.key):
|
|
|
- callback_done = True
|
|
|
# if '/pcd_depthcamera.mp4' in str(obj2.key):
|
|
|
# pcd1_done = True
|
|
|
if '/pcd_lidar.mp4' in str(obj2.key):
|
|
|
@@ -104,8 +133,8 @@ if __name__ == '__main__':
|
|
|
# logging.info( "%s 存在点云视频 pcd_depthcamera.mp4 和 pcd_lidar.mp4" % str(parse_prefix_full))
|
|
|
# logging.info("%s 存在点云视频 pcd_lidar.mp4 " % str(parse_prefix_full))
|
|
|
continue
|
|
|
- if not callback_done:
|
|
|
- # logging.info("数据已回调完成，不需要处理: %s" % str(parse_prefix_full))
|
|
|
+ error_bag_list = parse_json_to_string_array(error_bag_json)
|
|
|
+ if parse_prefix_full in error_bag_list:
|
|
|
continue
|
|
|
logging.info("%s 缺少点云视频 pcd_depthcamera.mp4 和 pcd_lidar.mp4" % str(parse_prefix_full))
|
|
|
# print(f'需要解析{merged_bag_object_key}')
|
