Commit 94bef5ff authored by Allvey's avatar Allvey

启动脚本取消二次调度

parent f124d78c
...@@ -289,7 +289,9 @@ def global_period_para_update(): ...@@ -289,7 +289,9 @@ def global_period_para_update():
"load_area_uuid_to_index_dict": load_area_uuid_to_index_dict, "load_area_uuid_to_index_dict": load_area_uuid_to_index_dict,
"unload_area_index_to_uuid_dict": unload_area_index_to_uuid_dict, "unload_area_index_to_uuid_dict": unload_area_index_to_uuid_dict,
"park_uuid_to_index_dict": park_uuid_to_index_dict, "park_uuid_to_index_dict": park_uuid_to_index_dict,
"park_index_to_uuid_dict": park_index_to_uuid_dict} "park_index_to_uuid_dict": park_index_to_uuid_dict,
"unloading_time": unloading_time,
"loading_time": loading_time}
# 矿卡集合 # 矿卡集合
truck_set = set(update_total_truck()) truck_set = set(update_total_truck())
......
...@@ -85,7 +85,7 @@ class DumpInfo(WalkManage): ...@@ -85,7 +85,7 @@ class DumpInfo(WalkManage):
# except Exception as es: # except Exception as es:
# self.logger.error(f"卸载设备 {dump_id} 卸载时间信息缺失, 已设为默认值(1min)") # self.logger.error(f"卸载设备 {dump_id} 卸载时间信息缺失, 已设为默认值(1min)")
# self.logger.error(es) # self.logger.error(es)
self.unloading_time[self.dump_uuid_to_index_dict[dump_id]] = unloading_time self.unloading_time[self.dump_uuid_to_index_dict[dump_id]] = get_value("unloading_time")
# print("average_unload_time: ", self.unloading_time[self.dump_uuid_to_index_dict[dump_id]]) # print("average_unload_time: ", self.unloading_time[self.dump_uuid_to_index_dict[dump_id]])
# 更新卸载设备出入时间 # 更新卸载设备出入时间
......
...@@ -83,7 +83,7 @@ class ExcavatorInfo(WalkManage): ...@@ -83,7 +83,7 @@ class ExcavatorInfo(WalkManage):
self.logger.info(self.loading_time) self.logger.info(self.loading_time)
self.logger.info("excavator_uuid_to_index_dict") self.logger.info("excavator_uuid_to_index_dict")
self.logger.info(self.excavator_uuid_to_index_dict) self.logger.info(self.excavator_uuid_to_index_dict)
self.loading_time[self.excavator_uuid_to_index_dict[excavator_id]] = loading_time self.loading_time[self.excavator_uuid_to_index_dict[excavator_id]] = get_value("loading_time")
# 更新挖机设备出入时间 # 更新挖机设备出入时间
def update_excavator_entrance_exit_time(self): def update_excavator_entrance_exit_time(self):
......
...@@ -3,6 +3,6 @@ ps -ef|grep realtime_dispatch.py|grep -v grep |awk {'print $2'} |xargs kill -9 ...@@ -3,6 +3,6 @@ ps -ef|grep realtime_dispatch.py|grep -v grep |awk {'print $2'} |xargs kill -9
sleep 2 sleep 2
python3 topo_update_server.py python3 topo_update_server.py
sleep 2 sleep 2
nohup python3 realtime_dispatch.py --active >/dev/null 2>&1 & nohup python3 realtime_dispatch.py >/dev/null 2>&1 &
sleep 2 sleep 2
nohup flask run --host=0.0.0.0 >/dev/null 2>&1 & nohup flask run --host=0.0.0.0 >/dev/null 2>&1 &
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment