commit

src/python2/pjisuv/camera-pjisuv.py

@@ -8,7 +8,7 @@ import oss2
 from resource import camera_mp4
 import logging
 
-path1 = '/mnt/disk001/cicv-data-closedloop/python2-pjisuv-module/'
+path1 = '/mnt/disk001/dcl_data_process/src/python2/pjisuv/'
 
 logging.basicConfig(filename=path1 + 'log/camera.log', level=logging.INFO,
                     format='%(asctime)s - %(levelname)s - %(message)s')

src/python2/pjisuv/merge-pjisuv.py

@@ -17,7 +17,7 @@ key3 = 'data_merge/'
 key4 = 'data_parse/'
 sleep_time = 60  # 每多少秒扫描一次
 compress_way = Compression.BZ2
-car_list = ['pjisuv-002','pjisuv-005']
+car_list = ['pjisuv-002', 'pjisuv-005']
 
 
 # 判断是否在done_list 中
@@ -96,12 +96,12 @@ if __name__ == '__main__':
                 # 1 判断两个json是否存在
                 exist = bucket.object_exists(node1_done_json_key)
                 if not exist:
-                    logging.info('不存在文件 %s' % node1_done_json_key)
+                    logging.info('没有数据需要合并，因为不存在文件 %s' % node1_done_json_key)
                     time.sleep(2)
                     continue
                 exist = bucket.object_exists(node2_done_json_key)
                 if not exist:
-                    logging.info('不存在文件 %s' % node2_done_json_key)
+                    logging.info('没有数据需要合并，因为不存在文件 %s' % node2_done_json_key)
                     time.sleep(2)
                     continue
                 # 2 读取两个json为数组