修复挖机故障/下线后继续派车问题

core/util.py

@@ -9,6 +9,7 @@
 import requests
 from tables import *
 from settings import get_logger
+from data.para_config import get_value
 with open(json_file, encoding='UTF-8') as f:
     mysql_config = json.load(f)["mysql"]
 with open(json_file, encoding='UTF-8') as f:
@@ -138,8 +139,14 @@ def delete_disabled_load_area(load_area_dict):
     """
     for load_area in list(load_area_dict.keys()):
         excavator_id = session_mysql.query(DispatchSetting).filter_by(load_area_id=load_area).first().exactor_id
-        excavator_info = session_mysql.query(Equipment).filter_by(id=excavator_id).first()
-        if excavator_info is None or excavator_info.disabled == 1:
+        excavator_uuid_to_name_dict = get_value("excavator_uuid_to_name_dict")
+        excavator_name = excavator_uuid_to_name_dict[excavator_id]
+        key_value_dict = redis2.hgetall(excavator_name)
+        is_excavator_online = key_value_dict[str_to_byte('online')]
+        if bytes.decode(is_excavator_online) not in ["true" or "True"]:
+        #     continue
+        # excavator_info = session_mysql.query(Equipment).filter_by(id=excavator_id).first()
+        # if excavator_info is None or excavator_info.disabled == 1:
             del load_area_dict[load_area]
 
 

data/dispatchInfo.py

@@ -195,6 +195,26 @@ class DispatchInfo:
         # update excavator_id <-> group_id && unload_area_id <-> group_id && truck_id <-> group_id
         try:
             for item in session_mysql.query(DispatchSetting).filter_by(isdeleted=0).all():
+
+                excavator_uuid_to_name_dict = get_value("excavator_uuid_to_name_dict")
+                excavator_name = excavator_uuid_to_name_dict[item.exactor_id]
+                key_value_dict = redis2.hgetall(excavator_name)
+                is_excavator_online = key_value_dict[str_to_byte('online')]
+                excavator_state = key_value_dict[str_to_byte('state')]
+
+                truck_uuid_to_name_dict = get_value("truck_uuid_to_name_dict")
+                truck_name = truck_uuid_to_name_dict[item.truck_id]
+                key_value_dict = redis2.hgetall(truck_name)
+                is_truck_online = key_value_dict[str_to_byte('online')]
+                truck_state = key_value_dict[str_to_byte('state')]
+
+                if str(bytes.decode(excavator_state)) == "7" or str(bytes.decode(truck_state)) == "7":
+                    continue
+
+                if bytes.decode(is_excavator_online) not in ["true" or "True"] or bytes.decode(is_truck_online) not in \
+                        ["true" or "True"]:
+                    continue
+
                 # add group_excavators
                 excavator_state = session_mysql.query(Equipment).filter_by(id=item.exactor_id).first()
                 # if excavator_state is not None and excavator_state.disabled == 0:
@@ -227,12 +247,6 @@ class DispatchInfo:
                 # add truck
                 truck_state = session_mysql.query(Equipment).filter_by(id=item.truck_id).first()
                 # if truck_state is not None and truck_state.disabled == 1:
-                truck_uuid_to_name_dict = get_value("truck_uuid_to_name_dict")
-                truck_name = truck_uuid_to_name_dict[item.truck_id]
-                key_value_dict = redis2.hgetall(truck_name)
-                is_online = key_value_dict[str_to_byte('online')]
-                if bytes.decode(is_online) not in ["true" or "True"]:
-                    continue
                 if item.group_id not in cls.group_truck_dict.keys():
                     cls.group_truck_dict[item.group_id] = [item.truck_id]
                 else:
@@ -242,6 +256,8 @@ class DispatchInfo:
 
             logger.info("存在的分组")
             logger.info(cls.group_excavator_dict.keys())
+            logger.info(cls.group_dump_dict.keys())
+            logger.info(cls.group_truck_dict.keys())
         except Exception as es:
             logger.error("挖机/卸载区/矿卡与group_id映射更新异常")
             logger.error(es)