代码错误修复 & 删除多余文件

.gitignore

@@ -2,3 +2,4 @@
 /.idea/
 /Logs/
 /waytous/
+*.pyc
\ No newline at end of file

alg/algorithm.py

@@ -297,7 +297,7 @@ class ExpectedTime(AlgorithmBase):
                 dump_id = DeviceMap.dump_index_to_uuid_dict[int(trip[1])]
 
                 # 卸点对应分组编号
-                unload_area_group_index = self.group.unload_area_uuid_index_dict[unload_area_id]
+                unload_area_group_index = self.group.unload_area_uuid_index_dict[dump_id]
 
                 # 车辆驶往各目的地时间
                 truck_reach_time = 60 * self.group.to_excavator_distance[unload_area_group_index, :] \

core/dispatcher.py

@@ -134,8 +134,8 @@ class DispatchSubmission:
                 try:
 
                     record["id"] = item.id
-                    record["exactorId"] = dispatch_seq[0]
-                    record["dumpId"] = item.dump_id
+                    record["exactorId"] = item.exactor_id
+                    record["dumpId"] = dispatch_seq[1]
                     record["loadAreaId"] = item.load_area_id
                     record["unloadAreaId"] = item.unload_area_id
                     record["groupId"] = group_id

settings.py

@@ -60,15 +60,15 @@ def set_log():
 
     # 创建日志目录
 
-    # if not os.path.exists(log_path):
-    #     os.mkdir(log_path)
+    if not os.path.exists(log_path):
+        os.mkdir(log_path)
     # logging初始化工作
     logging.basicConfig()
 
 
     # timefilehandler = logging.handlers.TimedRotatingFileHandler(log_path + "/dispatch.log", when='M', interval=1, backupCount=60)
-    # filehandler = logging.handlers.RotatingFileHandler(log_path + "/dispatch.log", maxBytes=3*1024*1024, backupCount=10, encoding="utf-8")
-    filehandler = logging.handlers.RotatingFileHandler("./Logs/dispatch.log", maxBytes=3 * 1024 * 1024, backupCount=10, encoding="utf-8")
+    filehandler = logging.handlers.RotatingFileHandler(log_path + "/dispatch.log", maxBytes=3*1024*1024, backupCount=10, encoding="utf-8")
+    # filehandler = logging.handlers.RotatingFileHandler("./Logs/dispatch.log", maxBytes=3 * 1024 * 1024, backupCount=10, encoding="utf-8")
     # 设置后缀名称，跟strftime的格式一样
     filehandler.suffix = "%Y-%m-%d_%H-%M.log"
 

test.py

-from static_data_process import *
-from settings import *
-import numpy as np
-
-from data.dispatchInfo import DispatchInfo
-from bidict import bidict
-from alg.algorithm import AlgorithmBase
-
-if __name__ == '__main__':
-    # dynamic_excavator_set = set(update_autodisp_excavator())
-    # dynamic_excavator_num = len(dynamic_excavator_set)
-    #
-    # dynamic_dump_set = set(update_autodisp_dump())
-    # dynamic_dump_num = len(dynamic_dump_set)
-    #
-    # dynamic_excavator_list = []
-    # for item in (
-    #         session_mysql.query(Dispatch).filter_by(isdeleted=0, isauto=1).all()
-    # ):
-    #     dynamic_excavator_list.append(item.exactor_id)
-    # if len(dynamic_excavator_list) < 1:
-    #     raise Exception("无动态派车计划可用-动态派车挖机/卸载设备集合读取异常")
-
-    # 更新数据库缓存
-    DispatchInfo.renew_set()
-
-    DispatchInfo.update_device_group_structure()
-
-    DispatchInfo.update_route_distance()
-
-    DispatchInfo.update_group_mode()
-
-    a = DispatchInfo.get_group_mode('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
-    a_excavator = DispatchInfo.get_excavator('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
-    a_dump = DispatchInfo.get_dump('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
-    a_truck = DispatchInfo.get_truck_set('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
-    # bb = DispatchInfo.get_to_excavator_distance('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
-    # cc = DispatchInfo.get_to_dump_distance('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
-
-    print(a_excavator)
-    print(a_dump)
-    print(a_truck)
-
-
-
-

test2.py

-import numpy as np
-b = np.full(2,0)