commit

src/python2/pjibot_delivery/csv-pjibot_delivery.py

@@ -47,6 +47,7 @@ def parse_csv(data_bag, parse_prefix, local_parse_dir, local_delete_list):
 
         # 生成pdf
         try:
+            # 设置调用目录
             os.chdir(path2)
             # 构造命令
             command1 = ['./pji_outdoor_real',

src/python2/pjisuv/camera-pjisuv.py

@@ -87,7 +87,6 @@ if __name__ == '__main__':
                     oss_delete_list = []
                     # 获取合并后的包
                     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'):
                         merged_bag_object_key_split = merged_bag_object_key.split('/')
                         merged_prefix = '/'.join(merged_bag_object_key_split[:-1])

src/python2/pjisuv/pcd-pjisuv.py

@@ -8,7 +8,7 @@ import logging
 
 path1 = '/mnt/disk001/dcl_data_process/src/python2/pjisuv/'
 
-logging.basicConfig(filename=path1 + 'log/pcd_pjisuv.log', level=logging.INFO,
+logging.basicConfig(filename=path1 + 'log/pcd-pjisuv.log', level=logging.INFO,
                     format='%(asctime)s - %(levelname)s - %(message)s')
 
 key1 = 'pjisuv/'

src/python2/pjisuv/simulation-pjisuv.py

@@ -75,7 +75,7 @@ def upload_simulation(parse_prefix, mp41):
         logging.info('上传仿真视频到 %s' % parse_prefix + 'scenario_orig.mp4')
         # bucket.put_object_from_file(parse_prefix + 'scenario_hmi.mp4', mp42)
         # logging.info('上传仿真视频到 %s' % parse_prefix + 'scenario_hmi.mp4')
-        shutil.rmtree(path1) # 仿真完就删除
+        shutil.rmtree(path1)  # 仿真完就删除
     except Exception as e:
         logging.exception("上传视频报错 %s" % str(e))
 
@@ -112,21 +112,10 @@ def is_upload_completed(bucket, prefix):
     return int(count) == int(target_number)
 
 
-'''
-cname：http://open-bucket.oss.icvdc.com
-keyid：n8glvFGS25MrLY7j
-secret：xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
-oss桶名： oss://open-bucket
-
-oss桶名： open-bucket
-内网endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com
-'''
 # ------- 获取合并之后的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, 'open-bucket')
     while True: