Skip to content

I
integrated-scheduling-v3
Commit 0481fc30 authored by 张晓彤's avatar 张晓彤
Browse files
Options

修复redis2 loadTime变动问题，处理车辆maxSpeed异常问题

parent 4f4207e2
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 19 deletions
equipment/truck.py
View file @ 0481fc30
...@@ -195,13 +195,13 @@ class TruckInfo(WalkManage): ...@@ -195,13 +195,13 @@ class TruckInfo(WalkManage):
self.last_load_time[item] = tmp_time self.last_load_time[item] = tmp_time
else: else:
self.last_load_time[item] = datetime.now() self.last_load_time[item] = datetime.now()
redis2.hsetnx(truck_uuid_to_name_dict[item], str_to_byte("lastLoadTime"), # redis2.hsetnx(truck_uuid_to_name_dict[item], str_to_byte("lastLoadTime"),
"\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"") # "\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"")
self.logger.info("lastLoadTime is Error") self.logger.info("lastLoadTime is Error")
else: else:
self.last_load_time[item] = datetime.now() self.last_load_time[item] = datetime.now()
redis2.hsetnx(truck_uuid_to_name_dict[item], str_to_byte("lastLoadTime"), # redis2.hsetnx(truck_uuid_to_name_dict[item], str_to_byte("lastLoadTime"),
"\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"") # "\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"")
self.logger.info("lastLoadTime is None") self.logger.info("lastLoadTime is None")
self.relative_last_load_time[item] = float( self.relative_last_load_time[item] = float(
(self.last_load_time[item] - self.start_time) (self.last_load_time[item] - self.start_time)
...@@ -218,16 +218,16 @@ class TruckInfo(WalkManage): ...@@ -218,16 +218,16 @@ class TruckInfo(WalkManage):
self.last_unload_time[item] = tmp_time self.last_unload_time[item] = tmp_time
else: else:
self.last_unload_time[item] = datetime.now() self.last_unload_time[item] = datetime.now()
redis2.hsetnx(truck_uuid_to_name_dict[item], str_to_byte("lastUnloadTime"), # redis2.hsetnx(truck_uuid_to_name_dict[item], str_to_byte("lastUnloadTime"),
"\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"") # "\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"")
self.logger.info("lastUnloadTime is Error") self.logger.info("lastUnloadTime is Error")
else: else:
self.last_unload_time[item] = datetime.now() self.last_unload_time[item] = datetime.now()
# key_value_dict[str_to_byte("lastUnloadTime")] = datetime.now().strftime( # key_value_dict[str_to_byte("lastUnloadTime")] = datetime.now().strftime(
# "%b %d, %Y %I:%M:%S %p" # "%b %d, %Y %I:%M:%S %p"
# ) # )
redis2.hsetnx(truck_uuid_to_name_dict[item], str_to_byte("lastUnloadTime"), # redis2.hsetnx(truck_uuid_to_name_dict[item], str_to_byte("lastUnloadTime"),
"\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"") # "\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"")
self.logger.info("lastUnloadTime is None") self.logger.info("lastUnloadTime is None")
self.relative_last_unload_time[item] = float( self.relative_last_unload_time[item] = float(
(self.last_unload_time[item] - self.start_time) (self.last_unload_time[item] - self.start_time)
...@@ -241,15 +241,15 @@ class TruckInfo(WalkManage): ...@@ -241,15 +241,15 @@ class TruckInfo(WalkManage):
self.last_unload_time[item] = datetime.now() self.last_unload_time[item] = datetime.now()
# key_value_dict["lastUnloadTime"] = datetime.now().strftime( # key_value_dict["lastUnloadTime"] = datetime.now().strftime(
# "%b %d, %Y %I:%M:%S %p") # "%b %d, %Y %I:%M:%S %p")
if str_to_byte("lastUnloadTime") in key_value_dict.keys(): # if str_to_byte("lastUnloadTime") in key_value_dict.keys():
# redis2.hset(truck_uuid_to_name_dict[item], str_to_byte("lastUnloadTime"), # # redis2.hset(truck_uuid_to_name_dict[item], str_to_byte("lastUnloadTime"),
# datetime.now().strftime("%b %d, %Y %I:%M:%S %p")) # # datetime.now().strftime("%b %d, %Y %I:%M:%S %p"))
redis2.hset(truck_uuid_to_name_dict[item], str_to_byte("lastUnloadTime"), # redis2.hset(truck_uuid_to_name_dict[item], str_to_byte("lastUnloadTime"),
"\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"") # "\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"")
else: # else:
redis2.hsetnx(truck_uuid_to_name_dict[item], str_to_byte("lastUnloadTime"), # redis2.hsetnx(truck_uuid_to_name_dict[item], str_to_byte("lastUnloadTime"),
"\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"") # "\"" + datetime.now().strftime("%Y-%m-%d %H:%M:%S") + "\"")
# redis2.hsetnx(truck_uuid_to_name_dict[item], str(json.dumps(key_value_dict))) # # redis2.hsetnx(truck_uuid_to_name_dict[item], str(json.dumps(key_value_dict)))
except Exception as es: except Exception as es:
self.logger.error("读取矿卡可用时间异常-redis读取异常") self.logger.error("读取矿卡可用时间异常-redis读取异常")
self.logger.error(es) self.logger.error(es)
...@@ -674,12 +674,23 @@ class TruckInfo(WalkManage): ...@@ -674,12 +674,23 @@ class TruckInfo(WalkManage):
def update_truck_speed(self): def update_truck_speed(self):
for truck_id in self.dynamic_truck_set: for truck_id in self.dynamic_truck_set:
try: try:
self.empty_speed[truck_id] = session_mysql.query(EquipmentSpec). \ empty_speed = session_mysql.query(EquipmentSpec). \
join(Equipment, EquipmentSpec.id == Equipment.equipment_spec). \ join(Equipment, EquipmentSpec.id == Equipment.equipment_spec). \
filter(Equipment.id == truck_id).first().max_speed filter(Equipment.id == truck_id).first().max_speed
self.heavy_speed[truck_id] = session_mysql.query(EquipmentSpec). \
if (empty_speed <= 1) or (empty_speed >= 50) or (empty_speed is None):
self.empty_speed[truck_id] = 20
else:
self.empty_speed[truck_id] = empty_speed
heavy_speed = session_mysql.query(EquipmentSpec). \
join(Equipment, EquipmentSpec.id == Equipment.equipment_spec). \ join(Equipment, EquipmentSpec.id == Equipment.equipment_spec). \
filter(Equipment.id == truck_id).first().max_speed filter(Equipment.id == truck_id).first().max_speed
if (heavy_speed <= 1) or (heavy_speed >= 50) or (heavy_speed is None):
self.heavy_speed[truck_id] = 20
else:
self.heavy_speed[truck_id] = heavy_speed
except Exception as es: except Exception as es:
self.logger.error("车辆速度更新异常") self.logger.error("车辆速度更新异常")
self.logger.error(es) self.logger.error(es)
......
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