commit

src/python2/pjibot_delivery/xosc-pjibot_delivery.py

@@ -69,7 +69,6 @@ if __name__ == '__main__':
                             if '/pos_pji.csv' in str(obj3.key):
                                 csv2_done = True
                         if xosc_done:
-                            logging.info("存在 simulation.xosc(scenario.xosc): %s" % str(parse_prefix_full))
                             continue
                         if not csv1_done:
                             logging.info("不存在 /objects_pji.csv: %s" % str(parse_prefix_full))

src/python2/pjibot_patrol/simulation-pjibot_partol.py

@@ -8,7 +8,7 @@ import docker
 import logging
 
 key1 = 'pjibot_patrol/'
-path1 = '/scenarios2/'
+path1 = '/scenarios4/'
 path2 = '/mnt/disk001/dcl_data_process/src/python2/pjibot_patrol/'
 path3 = '/mnt/disk001/simulation_outdoor/'
 vehicle_name = 'PuJin_patrol_robot'  # 配送 PuJin_distribution 巡检 PuJin_patrol_robot
@@ -51,7 +51,7 @@ def upload_simulation(parse_prefix, mp41):
 
 def simulation(parse_prefix, mp41):
     try:
-        os.system("docker start vtd2")
+        os.system("docker start vtd4")
         # 实例化Docker客户端
         client = docker.from_env()
         while True:
@@ -61,7 +61,7 @@ def simulation(parse_prefix, mp41):
             run = False
             # 打印容器列表
             for container in containers:
-                if 'vtd2' == container.name:
+                if 'vtd4' == container.name:
                     run = True
                     break
             if not run:

src/python2/pjibot_patrol/xosc-pjibot_patrol.py

@@ -69,7 +69,6 @@ if __name__ == '__main__':
                             if '/pos_pji.csv' in str(obj3.key):
                                 csv2_done = True
                         if xosc_done:
-                            logging.info("存在simulation.xosc(scenario.xosc): %s" % str(parse_prefix_full))
                             continue
                         if not csv1_done:
                             logging.info("不存在/objects_pji.csv: %s" % str(parse_prefix_full))