电铲故障优化

core/group.py

@@ -581,7 +581,8 @@ class GroupDispatcher:
                         # self.redispatch_to_dump(truck_id, truck_dispatch, truck_locate, truck_trip)
                         try:
                             truck_info.redispatch =\
-                                self.redispatcher.redispatch_to_dump(truck_id, truck_dispatch, truck_locate, truck_trip)
+                                self.redispatcher.redispatch_to_dump(truck_id, truck_dispatch, truck_locate, truck_trip,
+                                                                     truck_info)
                         except Exception as es:
                             self.logger.error("二次调度至卸载点失败")
                             self.logger.error(es)

data/dispatchInfo.py

@@ -11,6 +11,7 @@ from data.para_config import *
 from bidict import bidict
 from settings import get_logger
 from equipment.excavator import ExcavatorInfo
+from equipment.dump import DumpInfo
 from equipment.truck import TruckInfo
 
 logger = get_logger("zxt.dispatchInfo")
@@ -196,14 +197,16 @@ class DispatchInfo:
         excavator = ExcavatorInfo()
         excavator.update_excavator_current_state()
 
-        truck = TruckInfo()
+        dump = DumpInfo()
+
+        truck = TruckInfo(dump, excavator)
         truck.update_truck_current_task()
 
         try:
             for item in session_mysql.query(DispatchSetting).filter_by(isdeleted=0).all():
 
                 # add group_excavators
-                excavator_state = excavator.excavator_current_state[item.excavator_id]
+                excavator_state = excavator.excavator_current_state[item.exactor_id]
                 if excavator_state is None or excavator_state not in [6, 7]:
                     if item.group_id not in cls.group_excavator_dict.keys():
                         cls.group_excavator_dict[item.group_id] = [item.exactor_id]

equipment/excavator.py

@@ -230,10 +230,10 @@ class ExcavatorInfo(WalkManage):
                             excavator_name_to_uuid_dict[item]
                         ] = currentState
             except Exception as es:
-                self.logger.warning("读取矿卡任务异常-reids读取异常")
+                self.logger.warning("读取挖机状态异常-reids读取异常")
                 self.logger.warning(es)
 
-        self.logger.info("矿卡当前任务：")
+        self.logger.info("挖机当前状态：")
         self.logger.info(self.excavator_current_state)
 
     def reset(self):

requirements.txt

+sqlalchemy
+redis
+numpy
+datetime
+mysql-connector
+psycopg2
+pulp
+flask
+flask-caching
+bidict
+requests
\ No newline at end of file