From 5aee3282aa1907bfedf31599bb3d9b78667cb8d4 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 14 May 2024 15:45:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20set=5Feq=5Frs=20=E4=BC=98=E5=85=88ep=5Fm?= =?UTF-8?q?onitored=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/services.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/enm/services.py b/apps/enm/services.py index 1cef091c..458434f7 100644 --- a/apps/enm/services.py +++ b/apps/enm/services.py @@ -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')