Skip to content

I
integrated-scheduling
Commit 188ad10f authored by Allvey's avatar Allvey
Browse files
Options

Merge branch 'master' of github.com:Allvey/integrated-scheduling

# Conflicts: # realtime_dispatch.py # settings.py # static_data_process.py # tables.py # traffic_flow_planner.py
parent 9e292917
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 50 deletions
.gitignore 0 → 100644
View file @ 188ad10f
/TFLog/
/logs/
/venv/
logs/dispatch.log
View file @ 188ad10f
...@@ -911,3 +911,83 @@ ...@@ -911,3 +911,83 @@
2021-08-02 10:06:13,813 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]] 2021-08-02 10:06:13,813 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-02 10:06:13,813 - settings: ERROR -1 2021-08-02 10:06:13,813 - settings: ERROR -1
2021-08-02 10:06:13,933 - settings: INFO #####################################周期更新结束##################################### 2021-08-02 10:06:13,933 - settings: INFO #####################################周期更新结束#####################################
2021-08-03 09:45:28,684 - settings: INFO 最小成本调度模式
2021-08-03 09:45:28,737 - settings: WARNING Model infeasible or unbounded
2021-08-03 09:45:28,737 - settings: INFO 最小成本:1750955.101491955
2021-08-03 09:45:28,737 - settings: INFO 各变量取值:
2021-08-03 09:45:28,738 - settings: INFO 重运车流:[[200.0, 0.0]] 单位: 吨/时
2021-08-03 09:45:28,738 - settings: INFO 空运车流:[[265.2452], [-65.2452]] 单位: 吨/时
2021-08-03 09:45:28,901 - settings: INFO 可用于动态派车的矿卡：
2021-08-03 09:45:28,902 - settings: INFO {'5f010e86-3398-4f88-a0e7-27d104cc8bbd', 'fa028808-a3f0-47dd-9929-f23e2cac2bf8', 'f68909a0-e644-415f-a140-15c19f162b8f', 'e0118ce2-7644-4f6e-aadc-8e0c33b11241', 'aae4642f-f74b-4514-971e-c800a4182152', '35bd9fcc-e57e-4e6d-854d-b6f1f16f6b19', '31c1c93a-b037-4ab6-88b6-eef6cd23804b', 'dd8f0405-1ade-4d23-8985-2a1e603c5c2a', 'fb1d5516-9a42-4f6e-84fe-9955723badce', '1b787c4a-210a-46ce-a32c-73cbc1cd5e39', '5221a7f5-0a90-482f-b2bd-c902110a792d', '9b251c39-42e8-4071-9a1f-d36625555513'}
2021-08-03 09:45:28,987 - settings: INFO
2021-08-03 09:45:28,987 - settings: INFO 调度系统启动
2021-08-03 09:45:29,512 - settings: INFO #####################################周期更新开始#####################################
2021-08-03 09:45:30,750 - settings: INFO 矿卡当前任务：
2021-08-03 09:45:30,750 - settings: INFO {'fa028808-a3f0-47dd-9929-f23e2cac2bf8': -2, '35bd9fcc-e57e-4e6d-854d-b6f1f16f6b19': -2, '9b251c39-42e8-4071-9a1f-d36625555513': -2, '31c1c93a-b037-4ab6-88b6-eef6cd23804b': -2, 'fb1d5516-9a42-4f6e-84fe-9955723badce': -2, 'e0118ce2-7644-4f6e-aadc-8e0c33b11241': -2, '1b787c4a-210a-46ce-a32c-73cbc1cd5e39': -2, 'aae4642f-f74b-4514-971e-c800a4182152': -2, '5f010e86-3398-4f88-a0e7-27d104cc8bbd': -2, 'f68909a0-e644-415f-a140-15c19f162b8f': -2, '5221a7f5-0a90-482f-b2bd-c902110a792d': -2, 'dd8f0405-1ade-4d23-8985-2a1e603c5c2a': -2}
2021-08-03 09:45:32,901 - settings: INFO 最小成本调度模式
2021-08-03 09:45:32,913 - settings: WARNING Model infeasible or unbounded
2021-08-03 09:45:32,914 - settings: INFO 最小成本:1750955.101491955
2021-08-03 09:45:32,914 - settings: INFO 各变量取值:
2021-08-03 09:45:32,914 - settings: INFO 重运车流:[[200.0, 0.0]] 单位: 吨/时
2021-08-03 09:45:32,914 - settings: INFO 空运车流:[[265.2452], [-65.2452]] 单位: 吨/时
2021-08-03 09:45:32,915 - settings: ERROR 矿卡 KK008 派车计划计算异常
2021-08-03 09:45:32,915 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,915 - settings: ERROR 矿卡 KK005 派车计划计算异常
2021-08-03 09:45:32,915 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,915 - settings: ERROR 矿卡 KK004 派车计划计算异常
2021-08-03 09:45:32,915 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,916 - settings: ERROR 矿卡 KK003 派车计划计算异常
2021-08-03 09:45:32,916 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,916 - settings: ERROR 矿卡 KK010 派车计划计算异常
2021-08-03 09:45:32,916 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,916 - settings: ERROR 矿卡 KK006 派车计划计算异常
2021-08-03 09:45:32,916 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,916 - settings: ERROR 矿卡 XDE120-8 派车计划计算异常
2021-08-03 09:45:32,916 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,916 - settings: ERROR 矿卡 KK002 派车计划计算异常
2021-08-03 09:45:32,916 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,916 - settings: ERROR 矿卡 KK001 派车计划计算异常
2021-08-03 09:45:32,916 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,916 - settings: ERROR 矿卡 KK007 派车计划计算异常
2021-08-03 09:45:32,916 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,916 - settings: ERROR 矿卡 NTE200-4（18#） 派车计划计算异常
2021-08-03 09:45:32,917 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,917 - settings: ERROR 矿卡 验证bug 派车计划计算异常
2021-08-03 09:45:32,917 - settings: ERROR 'WalkManage' object has no attribute 'get_o_time_eq'
2021-08-03 09:45:32,917 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,917 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,917 - settings: ERROR -1
2021-08-03 09:45:32,917 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,917 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,917 - settings: ERROR -1
2021-08-03 09:45:32,917 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,917 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,917 - settings: ERROR -1
2021-08-03 09:45:32,917 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,918 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,918 - settings: ERROR -1
2021-08-03 09:45:32,918 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,918 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,918 - settings: ERROR -1
2021-08-03 09:45:32,918 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,918 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,918 - settings: ERROR -1
2021-08-03 09:45:32,918 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,918 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,918 - settings: ERROR -1
2021-08-03 09:45:32,918 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,918 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,918 - settings: ERROR -1
2021-08-03 09:45:32,918 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,919 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,919 - settings: ERROR -1
2021-08-03 09:45:32,919 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,919 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,919 - settings: ERROR -1
2021-08-03 09:45:32,919 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,919 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,919 - settings: ERROR -1
2021-08-03 09:45:32,919 - settings: ERROR 调度结果写入异常-redis写入异常
2021-08-03 09:45:32,919 - settings: ERROR 调度结果:[[-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1]]
2021-08-03 09:45:32,919 - settings: ERROR -1
2021-08-03 09:45:33,194 - settings: INFO #####################################周期更新结束#####################################
realtime_dispatch.py
View file @ 188ad10f
This diff is collapsed.
settings.py
View file @ 188ad10f
...@@ -8,11 +8,6 @@ ...@@ -8,11 +8,6 @@
# 数据库设备, redis设置, 日志设置 # 数据库设备, redis设置, 日志设置
<<<<<<< HEAD
=======
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
from tables import * from tables import *
from urllib.parse import quote from urllib.parse import quote
import logging.handlers import logging.handlers
......
static_data_process.py
View file @ 188ad10f
...@@ -51,11 +51,7 @@ def build_park_uuid_index_map(): ...@@ -51,11 +51,7 @@ def build_park_uuid_index_map():
park_num = 0 park_num = 0
try: try:
<<<<<<< HEAD
for item in session_postgre.query(WalkTimePark).all(): for item in session_postgre.query(WalkTimePark).all():
=======
for item in session_postgre.query(WalkTimePort).all():
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
park = str(item.park_area_id) park = str(item.park_area_id)
if park not in park_uuid_to_index_dict: if park not in park_uuid_to_index_dict:
park_uuid_to_index_dict[park] = park_num park_uuid_to_index_dict[park] = park_num
...@@ -128,11 +124,7 @@ def update_deveices_map(unload_area_uuid_to_index_dict, load_area_uuid_to_index_ ...@@ -128,11 +124,7 @@ def update_deveices_map(unload_area_uuid_to_index_dict, load_area_uuid_to_index_
load_area_uuid_to_index_dict[load_area_id] load_area_uuid_to_index_dict[load_area_id]
excavator_num = excavator_num + 1 excavator_num = excavator_num + 1
if excavator_num < 1 or dump_num < 1: if excavator_num < 1 or dump_num < 1:
<<<<<<< HEAD
raise Exception("无动态派车计划可用-动态派车挖机/卸载设备映射失败") raise Exception("无动态派车计划可用-动态派车挖机/卸载设备映射失败")
=======
raise Exception("无动态派车计划可用-动态派车挖机/卸点映射失败")
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
except Exception as es: except Exception as es:
logger.warning(es) logger.warning(es)
...@@ -199,11 +191,7 @@ def update_autodisp_excavator(): ...@@ -199,11 +191,7 @@ def update_autodisp_excavator():
for item in session_mysql.query(Dispatch).filter_by(isdeleted=0, isauto=1).all(): for item in session_mysql.query(Dispatch).filter_by(isdeleted=0, isauto=1).all():
dynamic_excavator_list.append(item.exactor_id) dynamic_excavator_list.append(item.exactor_id)
if len(dynamic_excavator_list) < 1: if len(dynamic_excavator_list) < 1:
<<<<<<< HEAD
raise Exception("无动态派车计划可用-动态派车挖机/卸载设备集合读取异常") raise Exception("无动态派车计划可用-动态派车挖机/卸载设备集合读取异常")
=======
raise Exception("无动态派车计划可用-动态派车挖机/卸点集合读取异常")
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
except Exception as es: except Exception as es:
logger.warning(es) logger.warning(es)
...@@ -217,11 +205,7 @@ def update_autodisp_dump(): ...@@ -217,11 +205,7 @@ def update_autodisp_dump():
for item in session_mysql.query(Dispatch).filter_by(isdeleted=0, isauto=1).all(): for item in session_mysql.query(Dispatch).filter_by(isdeleted=0, isauto=1).all():
dynamic_dump_list.append(item.dump_id) dynamic_dump_list.append(item.dump_id)
if len(dynamic_dump_list) < 1: if len(dynamic_dump_list) < 1:
<<<<<<< HEAD
raise Exception("无动态派车计划可用-动态派车挖机/卸载设备集合读取异常") raise Exception("无动态派车计划可用-动态派车挖机/卸载设备集合读取异常")
=======
raise Exception("无动态派车计划可用-动态派车挖机/卸点集合读取异常")
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
except Exception as es: except Exception as es:
logger.warning(es) logger.warning(es)
return dynamic_dump_list return dynamic_dump_list
...@@ -238,14 +222,10 @@ def update_unload_area(): ...@@ -238,14 +222,10 @@ def update_unload_area():
unload_area_list = [] unload_area_list = []
for walk_time in session_postgre.query(WalkTime).all(): for walk_time in session_postgre.query(WalkTime).all():
unload_area_list.append(walk_time.unload_area_id) unload_area_list.append(walk_time.unload_area_id)
<<<<<<< HEAD
return unload_area_list return unload_area_list
def update_park_area(): def update_park_area():
park_area_list = [] park_area_list = []
for walk_time_park in session_postgre.query(WalkTimePark).all(): for walk_time_park in session_postgre.query(WalkTimePark).all():
park_area_list.append(walk_time_park.park_area_id) park_area_list.append(walk_time_park.park_area_id)
return park_area_list return park_area_list
======= \ No newline at end of file
return unload_area_list
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
tables.py
View file @ 188ad10f
...@@ -119,28 +119,19 @@ class WalkTime(Base): ...@@ -119,28 +119,19 @@ class WalkTime(Base):
unload_area_name = Column(VARCHAR(30)) unload_area_name = Column(VARCHAR(30))
to_unload_distance = Column(Float(10)) to_unload_distance = Column(Float(10))
to_load_distance = Column(Float(10)) to_load_distance = Column(Float(10))
<<<<<<< HEAD
to_unload_lanes = Column(VARCHAR(100)) to_unload_lanes = Column(VARCHAR(100))
to_load_lanes = Column(VARCHAR(100)) to_load_lanes = Column(VARCHAR(100))
def __init__(self, load_area_id, unload_area_id, load_area_name, unload_area_name, to_load_distance, def __init__(self, load_area_id, unload_area_id, load_area_name, unload_area_name, to_load_distance,
to_unload_distance, to_unload_lanes, to_load_lanes): to_unload_distance, to_unload_lanes, to_load_lanes):
=======
def __init__(self, load_area_id, unload_area_id, load_area_name, unload_area_name, to_load_distance,
to_unload_distance):
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
self.load_area_id = load_area_id self.load_area_id = load_area_id
self.unload_area_id = unload_area_id self.unload_area_id = unload_area_id
self.load_area_name = load_area_name self.load_area_name = load_area_name
self.unload_area_name = unload_area_name self.unload_area_name = unload_area_name
self.to_load_distance = to_load_distance self.to_load_distance = to_load_distance
self.to_unload_distance = to_unload_distance self.to_unload_distance = to_unload_distance
<<<<<<< HEAD
self.to_unload_lanes = to_unload_lanes self.to_unload_lanes = to_unload_lanes
self.to_load_lanes = to_load_lanes self.to_load_lanes = to_load_lanes
=======
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
# Rid = Column(VARCHAR(36), primary_key=True) # Rid = Column(VARCHAR(36), primary_key=True)
# load_area_id = Column(VARCHAR(36)) # load_area_id = Column(VARCHAR(36))
...@@ -222,7 +213,6 @@ class EquipmentPair(Base): ...@@ -222,7 +213,6 @@ class EquipmentPair(Base):
self.isdeleted = isdeleted self.isdeleted = isdeleted
self.createtime = createtime self.createtime = createtime
<<<<<<< HEAD
# class Lane(Base): # class Lane(Base):
# # 表的名字 # # 表的名字
# __tablename__ = 'Geo_Node' # __tablename__ = 'Geo_Node'
...@@ -245,8 +235,6 @@ class Lane(Base): ...@@ -245,8 +235,6 @@ class Lane(Base):
self.Length = Length self.Length = Length
self.MaxSpeed = MaxSpeed self.MaxSpeed = MaxSpeed
=======
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
class Dispatch(Base): class Dispatch(Base):
# 表的名字: # 表的名字:
__tablename__ = 'sys_dispatch_setting' __tablename__ = 'sys_dispatch_setting'
...@@ -287,11 +275,7 @@ class Dispatch(Base): ...@@ -287,11 +275,7 @@ class Dispatch(Base):
self.deletor = deletor self.deletor = deletor
self.deletetime = deletetime self.deletetime = deletetime
<<<<<<< HEAD
class WalkTimePark(Base): class WalkTimePark(Base):
=======
class WalkTimePort(Base):
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
__tablename__ = 'park_load_distance' __tablename__ = 'park_load_distance'
park_area_id = Column(VARCHAR(36), primary_key=True) park_area_id = Column(VARCHAR(36), primary_key=True)
...@@ -299,23 +283,15 @@ class WalkTimePort(Base): ...@@ -299,23 +283,15 @@ class WalkTimePort(Base):
park_area_name = Column(VARCHAR(36)) park_area_name = Column(VARCHAR(36))
load_area_name = Column(VARCHAR(36)) load_area_name = Column(VARCHAR(36))
park_load_distance = Column(Float(10)) park_load_distance = Column(Float(10))
<<<<<<< HEAD
park_load_lanes = Column(VARCHAR(100)) park_load_lanes = Column(VARCHAR(100))
def __init__(self, park_area_id, load_area_id, park_area_name, load_area_name, park_load_distance, park_load_lanes): def __init__(self, park_area_id, load_area_id, park_area_name, load_area_name, park_load_distance, park_load_lanes):
=======
def __init__(self, park_area_id, load_area_id, park_area_name, load_area_name, park_load_distance):
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
self.park_area_id = park_area_id self.park_area_id = park_area_id
self.load_area_id = load_area_id self.load_area_id = load_area_id
self.park_area_name = park_area_name self.park_area_name = park_area_name
self.load_area_name = load_area_name self.load_area_name = load_area_name
self.park_load_distance = park_load_distance self.park_load_distance = park_load_distance
<<<<<<< HEAD
self.park_load_lanes = park_load_lanes self.park_load_lanes = park_load_lanes
=======
>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
class Equipment(Base): class Equipment(Base):
__tablename__ = 'sys_equipment' __tablename__ = 'sys_equipment'
......
traffic_flow_planner.py
View file @ 188ad10f
This diff is collapsed.
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