commit

build/pjibot_guide-camera/EXE-00.toc

@@ -899,7 +899,7 @@
  [],
  False,
  False,
- 1741674113,
+ 1742280246,
  [('run',
    '/usr/local/lib/python2.7/dist-packages/PyInstaller/bootloader/Linux-64bit/run',
    'EXECUTABLE')])

config/pjibot_guide-callback.yaml

@@ -1,12 +1,12 @@
 ---
-oss:
+oss: # oss连接信息
   access-key-id: n8glvFGS25MrLY7j # oss access-key-id
   access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d # oss access-key-secret
   endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com # oss endpoint
   bucket-name: pji-bucket1 # oss 桶
-  data-root: pjibot/ # oss数据根目录
+  data-root: pjibot/ # 引导服务器机器人采集数据在oss上的根目录
 log-file-path: /mnt/disk001/dcl_data_process/log/pjibot_guide-callback.log # 日志文件路径
-platform-url:
+sleep-time: 60 # 定时任务每一轮休眠时间
+platform-url: # 平台接口信息
   auth: http://10.14.86.147:9081/device/auth # token 接口
-  callback: http://10.14.86.147:9081/device/data/callback # 数据回传接口
-sleep-time: 60 # 每一轮休眠时间
+  callback: http://10.14.86.147:9081/device/data/callback # 数据回传接口

config/pjibot_guide-camera.yaml

@@ -1,12 +1,11 @@
 ---
-oss:
-  access-key-id: n8glvFGS25MrLY7j
-  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
-  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com
-  bucket-name: pji-bucket1
-  data-root: pjibot/
-log-file-path: /mnt/disk001/dcl_data_process/log/pjibot_guide-camera.log
-pdf-command-dir: /mnt/disk001/pdf_outdoor/run/
-temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_guide/camera/
-sleep-time: 60 # 每一轮休眠时间
-error-bag-json: /mnt/disk001/dcl_data_process/errorbag/pjibot_guide/camera-errorBag.json
+oss: # oss连接信息
+  access-key-id: n8glvFGS25MrLY7j # oss access-key-id
+  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d # oss access-key-secret
+  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com # oss endpoint
+  bucket-name: pji-bucket1 # oss 桶
+  data-root: pjibot/ # 引导服务器机器人采集数据在oss上的根目录
+log-file-path: /mnt/disk001/dcl_data_process/log/pjibot_guide-camera.log # 日志文件路径
+sleep-time: 60 # 定时任务每一轮休眠时间
+temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_guide/camera/ # 临时文件目录
+error-bag-json: /mnt/disk001/dcl_data_process/errorbag/pjibot_guide/camera-errorBag.json # 处理失败后需要忽略处理的数据

config/pjibot_guide-csv.yaml

@@ -1,19 +1,19 @@
 ---
-oss:
-  access-key-id: n8glvFGS25MrLY7j
-  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
-  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com
-  bucket-name: pji-bucket1
-  data-root: pjibot/
-log-file-path: /mnt/disk001/dcl_data_process/log/pjibot_guide-csv.log
-pdf:
+oss: # oss连接信息
+  access-key-id: n8glvFGS25MrLY7j # oss access-key-id
+  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d # oss access-key-secret
+  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com # oss endpoint
+  bucket-name: pji-bucket1 # oss 桶
+  data-root: pjibot/ # 引导服务器机器人采集数据在oss上的根目录
+log-file-path: /mnt/disk001/dcl_data_process/log/pjibot_guide-csv.log # 日志文件路径
+sleep-time: 60 # 定时任务每一轮休眠时间
+temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_guide/csv/ # 临时文件目录
+error-bag-json: /mnt/disk001/dcl_data_process/errorbag/pjibot_guide/csv-errorBag.json # 处理失败后需要忽略处理的数据
+pdf: # 评价报告生成
   command: ./single_case_eval
   dir: /mnt/disk001/pdf_indoor/run
   config: /mnt/disk001/pdf_indoor/run/config.json
-merged-obstacles:
+merged-obstacles: # merged-obstacles.csv生成
   command: ./filter_pos 
   dir: /mnt/disk001/merged-obstacles
-  pgm: /mnt/disk001/merged-obstacles/shiyanshi_newpgm_20240416.pgm
-temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_guide/csv/
-sleep-time: 60 # 每一轮休眠时间
-error-bag-json: /mnt/disk001/dcl_data_process/errorbag/pjibot_guide/csv-errorBag.json
+  pgm: /mnt/disk001/merged-obstacles/shiyanshi_newpgm_20240416.pgm

config/pjibot_guide-merge.yaml

@@ -1,10 +1,10 @@
 ---
-temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_guide/merge/ # 临时文件目录
-log-file-path: /mnt/disk001/dcl_data_process/log/pjibot_guide-merge.log # 日志文件目录
-sleep-time: 60 # 每一轮休眠时间
 oss: # oss连接信息
-  access-key-id: n8glvFGS25MrLY7j
-  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
-  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com
-  bucket-name: pji-bucket1
-  data-root: pjibot/ # 引导服务器机器人在oss上的根目录
+  access-key-id: n8glvFGS25MrLY7j # oss access-key-id
+  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d # oss access-key-secret
+  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com # oss endpoint
+  bucket-name: pji-bucket1 # oss 桶
+  data-root: pjibot/ # 引导服务器机器人采集数据在oss上的根目录
+log-file-path: /mnt/disk001/dcl_data_process/log/pjibot_guide-merge.log # 日志文件路径
+sleep-time: 60 # 定时任务每一轮休眠时间
+temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_guide/merge/ # 临时文件目录

config/pjibot_guide-pcd.yaml

@@ -1,12 +1,12 @@
 ---
-temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_guide/pcd/
-oss: # oss信息
-  access-key-id: n8glvFGS25MrLY7j
-  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
-  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com
-  bucket-name: pji-bucket1
-  data-root: pjibot/
-log-file-path: /mnt/disk001/dcl_data_process/log/pjibot_guide-pcd.log # 日志路径
-sleep-time: 60 # 每一轮休眠时间
-error-bag-json: /mnt/disk001/dcl_data_process/errorbag/pjibot_guide/pcd-errorBag.json # 错误目录json
-run-sh-dir: /mnt/disk001/dcl_data_process/src/python2/pjibot_guide/resource/ # 运行脚本的目录
+oss: # oss连接信息
+  access-key-id: n8glvFGS25MrLY7j # oss access-key-id
+  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d # oss access-key-secret
+  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com # oss endpoint
+  bucket-name: pji-bucket1 # oss 桶
+  data-root: pjibot/ # 引导服务器机器人采集数据在oss上的根目录
+log-file-path: /mnt/disk001/dcl_data_process/log/pjibot_guide-pcd.log # 日志文件路径
+sleep-time: 60 # 定时任务每一轮休眠时间
+temp-dir: /mnt/disk001/dcl_data_process/temp/pjibot_guide/pcd/ # 临时文件目录
+error-bag-json: /mnt/disk001/dcl_data_process/errorbag/pjibot_guide/pcd-errorBag.json # 处理失败后需要忽略处理的数据
+run-sh-dir: /mnt/disk001/dcl_data_process/src/python2/pjibot_guide/resource/ # 运行点云处理脚本的目录

run/pjibot_guide-camera-nohup.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
-
-# 定义共同前缀变量
 BASE_DIR="/mnt/disk001/dcl_data_process"
-
-rm -rf "${BASE_DIR}/log/camera*"
-rm -rf "${BASE_DIR}/log/pjibot_guide-camera*"
+rm -rf "${BASE_DIR}/build/pjibot_guide-camera/" # 删除旧的可执行文件
+rm -rf "${BASE_DIR}/log/pjibot_guide-camera.out"
+rm -rf "${BASE_DIR}/log/pjibot_guide-camera.log"
 pyinstaller --onefile --distpath "${BASE_DIR}/build/pjibot_guide-camera/" "${BASE_DIR}/src/python2/pjibot_guide/pjibot_guide-camera.py"
-#nohup python2 "${BASE_DIR}/src/python2/pjibot_guide/pjibot_guide-camera.py" "${BASE_DIR}/config/pjibot_guide-camera.yaml" > "${BASE_DIR}/log/pjibot_guide-camera.out" 2>&1 &
 nohup "${BASE_DIR}/build/pjibot_guide-camera/pjibot_guide-camera" "${BASE_DIR}/config/pjibot_guide-camera.yaml" > "${BASE_DIR}/log/pjibot_guide-camera.out" 2>&1 &

src/python2/pjibot_guide/pjibot_guide-camera.py

@@ -62,7 +62,6 @@ if __name__ == '__main__':
     bucket_name = config['oss']['bucket-name'] # oss 桶
     oss_data_root = config['oss']['data-root'] # 数据所在的oss根目录
     log_file_path = config['log-file-path'] # 日志文件地址
-    pdf_command_dir = config['pdf-command-dir']
     temp_dir = config['temp-dir']
     error_bag_json = config['error-bag-json']
     sleep_time = config['sleep-time']  # 每多少秒扫描一次
@@ -76,7 +75,6 @@ if __name__ == '__main__':
     logging.info("Bucket Name:%s", config['oss']['bucket-name'])
     logging.info("OSS Data Root:%s", config['oss']['data-root'])
     logging.info("Log File Path:%s", config['log-file-path'])
-    logging.info("PDF命令目录:%s", config['pdf-command-dir'])
     logging.info("临时文件目录:%s", config['temp-dir'])
     logging.info("错误目录json路径:%s", config['error-bag-json'])
     logging.info("Sleep Time:%s", config['sleep-time'])