commit

src/python2/pjibot_delivery/2callback-pjibot_delivery.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 import json
 import time
+from contextlib import nullcontext
+
 import urllib2
 import oss2
 from datetime import datetime, timedelta
@@ -28,6 +30,7 @@ def add_hour(date_string, hour_number):
     new_date = original_date + timedelta(hours=hour_number)
     return new_date.strftime("%Y-%m-%d-%H-%M-%S")
 
+
 if __name__ == '__main__':
     auth = oss2.Auth('n8glvFGS25MrLY7j', 'xZ2Fozoarpfw0z28FUhtg8cu0yDc5d')
     endpoint = 'oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com'
@@ -113,10 +116,17 @@ if __name__ == '__main__':
                         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):
-                                bucket.copy_object(bucket_name, str(obj_old.key),
-                                                   str(obj_old.key).replace(old_date, new_date).replace('callback.json',
-                                                                                                        'callback_done.json'))
-                                bucket.delete_object(str(obj_old.key)) # 删除 callback.json
+                                if old_date is None: # 自定义上传的包可能没有date
+                                    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).replace(
+                                                           'callback.json',
+                                                           'callback_done.json'))
+                                bucket.delete_object(str(obj_old.key))  # 删除 callback.json
                         # todo 时区不变也就不需要移动文件了
                         #     else:
                         #         bucket.copy_object(bucket_name, str(obj_old.key),

src/python2/pjibot_delivery/2camera-nohup.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-if [ ! -d "./log" ]; then
-    mkdir "./log"
-    echo "Directory './log' created."
-else
-    echo "Directory './log' already exists."
-fi
-nohup python2 2camera-pjibot_delivery.py > log/2camera.out 2>&1 &

src/python2/pjibot_delivery/2camera-pjibot_delivery.py

@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-import time
-import oss2
-
-from resource import parse_robot_image
-
-import logging
-
-path1 = '/mnt/disk001/dcl_data_process/src/python2/pjibot_delivery/'
-
-logging.basicConfig(filename=path1 + 'log/2camera.log', level=logging.INFO,
-                    format='%(asctime)s - %(levelname)s - %(message)s')
-
-key1 = 'pjibot_delivery/'
-sleep_time = 30  # 每多少秒扫描一次
-
-
-def parse_to_mp4(merged_bag_file_path, parse_prefix1, local_parse_dir2, local_delete_list3):
-    try:
-        flag, local_mp4_dir = parse_robot_image.parse(merged_bag_file_path, local_parse_dir2 + '/camera/')
-        if flag:  # 没有话题就不生成视频了
-            mp4_file_name = 'camera'
-            local_mp4_file_path1 = local_mp4_dir + '/' + mp4_file_name + '.mp4'
-            local_delete_list3.append(local_mp4_file_path1)
-            oss_csv_object_key1 = parse_prefix1 + mp4_file_name + '.mp4'
-            bucket.put_object_from_file(oss_csv_object_key1, local_mp4_file_path1)
-            local_delete_list.append(local_merged_bag_path)
-        else:
-            # 有图像话题，解析完就删除，没有则不删除
-            logging.info("没有图像话题: %s", merged_bag_file_path)
-    except Exception as e2:
-        logging.exception("生成摄像头视频报错: %s", e2)
-
-
-# ------- 获取合并之后的bag包，解析出csv -------
-if __name__ == '__main__':
-    # 1 创建阿里云对象
-    auth = oss2.Auth('n8glvFGS25MrLY7j', 'xZ2Fozoarpfw0z28FUhtg8cu0yDc5d')
-    endpoint = 'oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com'
-    bucket = oss2.Bucket(auth, endpoint, 'open-bucket')
-
-    while True:
-        logging.info("开始新一轮扫描")
-        try:
-            local_delete_list = []
-            oss_delete_list = []
-            prefix_list = []
-            # 2 获取已经上传完成的所有目录并分组
-            for obj1 in oss2.ObjectIterator(bucket, prefix=key1):
-                # 获取合并后的包
-                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])
-                    parse_prefix = merged_prefix.replace('data_merge', 'data_parse')
-                    parse_prefix_full = merged_bag_object_key.replace('data_merge', 'data_parse')[:-4] + '/'
-                    camera_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 '/camera.mp4' in str(obj2.key):
-                            camera_done = True
-                    if camera_done:
-                        continue
-                    if not callback_done:  # 不存在存在callback.json的就不处理了
-                        continue
-
-                    local_merged_bag_path = path1 + 'camera/' + merged_bag_object_key
-                    local_merged_dir = '/'.join(local_merged_bag_path.split('/')[:-1])
-                    local_parse_dir = local_merged_dir.replace('data_merge', 'data_parse')
-                    if not os.path.exists(local_merged_dir):
-                        os.makedirs(local_merged_dir)
-                    if not os.path.exists(local_parse_dir):
-                        os.makedirs(local_parse_dir)
-                    merged_bag_full_name = merged_bag_object_key_split[-1]
-                    merged_bag_name = merged_bag_full_name.split('.')[0]
-                    try:
-                        bucket.get_object_to_file(merged_bag_object_key, local_merged_bag_path)
-                    except Exception as e:
-                        logging.exception("下载合并后的bag包失败: %s" % str(e))
-
-                    # 2 生成 pos_orig.csv 和 pos_hmi.csv
-                    logging.info("生成视频: %s" % str(obj1.key))
-                    parse_to_mp4(local_merged_bag_path, parse_prefix_full, local_parse_dir, local_delete_list)
-
-            # 删除本地临时文件
-            if len(local_delete_list) > 0:
-                for local_delete in local_delete_list:
-                    try:
-                        os.remove(local_delete)
-                    except Exception as e:
-                        pass
-                        # logging.exception("捕获到一个异常: %s" % str(e))
-            time.sleep(sleep_time)
-        except Exception as e:
-            logging.exception("全局错误处理: %s" % str(e))

src/python2/pjibot_delivery/callback-pjibot_delivery.py

@@ -114,10 +114,17 @@ if __name__ == '__main__':
                         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):
-                                bucket.copy_object(bucket_name, str(obj_old.key),
-                                                   str(obj_old.key).replace(old_date, new_date).replace('callback.json',
-                                                                                                        'callback_done.json'))
-                                bucket.delete_object(str(obj_old.key)) # 删除 callback.json
+                                if old_date is None: # 自定义上传的包可能没有date
+                                    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).replace(
+                                                           'callback.json',
+                                                           'callback_done.json'))
+                                bucket.delete_object(str(obj_old.key))  # 删除 callback.json
                         # todo 时区不变也就不需要移动文件了
                         #     else:
                         #         bucket.copy_object(bucket_name, str(obj_old.key),

src/python2/pjibot_patrol/callback-pjibot_patrol.py

@@ -121,10 +121,17 @@ if __name__ == '__main__':
                         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):
-                                bucket.copy_object(bucket_name, str(obj_old.key),
-                                                   str(obj_old.key).replace(old_date, new_date).replace('callback.json',
-                                                                                                        'callback_done.json'))
-                                bucket.delete_object(str(obj_old.key)) # 删除 callback.json
+                                if old_date is None: # 自定义上传的包可能没有date
+                                    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).replace(
+                                                           'callback.json',
+                                                           'callback_done.json'))
+                                bucket.delete_object(str(obj_old.key))  # 删除 callback.json
                         # todo 时区不变也就不需要移动文件了
                         #     else:
                         #         bucket.copy_object(bucket_name, str(obj_old.key),

src/python2/pjisuv/callback-pjisuv.py

@@ -118,9 +118,14 @@ if __name__ == '__main__':
                 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):
-                        bucket.copy_object(bucket_name, str(obj_old.key),
-                                           str(obj_old.key).replace(old_date, new_date).replace('callback.json',
-                                                                                                'callback_done.json'))
+                        if old_date is None:
+                            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).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))