zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: update_mpoint_cache state变动或超时更新设备运行状态2

This commit is contained in:
caoqianming 2024-04-24 18:20:39 +08:00
parent ecb95da787
commit 4ff503f1b0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/enm/services.py
View File

@ -121,7 +121,8 @@ def update_mpoint_cache(cache_key: str, current_cache_val: dict, last_timex: dat
ep_monitored_id = current_cache_val.get("ep_monitored", False)
last_data = current_cache_val["last_data"]
last_data["pre_val"] = last_data.get("last_val", None)
last_data["pre_timex"] = last_data.get("last_timex", None)
pre_timex = last_data.get("last_timex", None)
last_data["pre_timex"] = pre_timex
last_data["pre_mrs"] = last_data.get("last_mrs", None)
last_data["last_val"] = last_val
if last_mrs:
@ -134,7 +135,7 @@ def update_mpoint_cache(cache_key: str, current_cache_val: dict, last_timex: dat
if ep_monitored_id:
cache.set(f"equipment_{ep_monitored_id}", {"running_state": last_mrs, "running_state_timex": last_timex}, timeout=None)
# 如果state变动则触发函数
if last_data["pre_mrs"] != last_mrs or (timezone.now()-last_timex).total_seconds()>30:
if last_data["pre_mrs"] != last_mrs or pre_timex is None or (timezone.now()-pre_timex).total_seconds()>30:
if ep_belong_id:
ctask_run("apps.em.services.shutdown_or_startup", ep_belong_id, last_timex, Equipment.RUNING)
if ep_monitored_id: