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

fix: set_eq_rs 优先ep_monitored_id

This commit is contained in:
caoqianming 2024-05-14 15:45:42 +08:00
parent 6ba99f119a
commit 5aee3282aa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/enm/services.py
View File

@ -158,10 +158,10 @@ class MpointCache:
is_rep_ep_running_state = self.data.get("is_rep_ep_running_state", False)
ep_monitored_id = self.data.get("ep_monitored")
ep_belong_id = self.data.get("ep_belong")
if ep_belong_id:
set_eq_rs(ep_belong_id, timex, Equipment.OFFLINE)
if ep_monitored_id and is_rep_ep_running_state and ep_belong_id != ep_monitored_id:
if ep_monitored_id and is_rep_ep_running_state:
set_eq_rs(ep_monitored_id, timex, Equipment.OFFLINE)
if ep_belong_id and ep_belong_id != ep_monitored_id:
set_eq_rs(ep_belong_id, timex, Equipment.OFFLINE)
def set(self, last_timex: datetime, last_val):
current_cache_val = self.data
@ -191,10 +191,10 @@ class MpointCache:
# 下面开始更新设备信号
ep_belong_id = current_cache_val.get("ep_belong")
ep_monitored_id = current_cache_val.get("ep_monitored")
if ep_belong_id:
set_eq_rs(ep_belong_id, last_timex, Equipment.RUNING)
if ep_monitored_id and mpoint_is_rep_ep_running_state and ep_belong_id != ep_monitored_id:
if ep_monitored_id and mpoint_is_rep_ep_running_state:
set_eq_rs(ep_monitored_id, last_timex, last_mrs)
if ep_belong_id and ep_belong_id != ep_monitored_id:
set_eq_rs(ep_belong_id, last_timex, Equipment.RUNING)
mf_code = current_cache_val.get('mpoint_affect')