From 2c6d586d8509a4a2e9ac7fa527d7578d939f362a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sat, 11 May 2024 11:23:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E7=82=B9=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/services.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/apps/enm/services.py b/apps/enm/services.py index 4c40f6e1..2b13017e 100644 --- a/apps/enm/services.py +++ b/apps/enm/services.py @@ -156,13 +156,12 @@ class MpointCache: cache.set(self.cache_key, self.data, timeout=None) if reason == -2: is_rep_ep_running_state = self.data.get("is_rep_ep_running_state", False) - ep_monitored_id = self.data.get("ep_monitored", None) + ep_monitored_id = self.data.get("ep_monitored") ep_belong_id = self.data.get("ep_belong") - if is_rep_ep_running_state and ep_monitored_id: + if ep_belong_id and ep_belong_id != ep_monitored_id: + set_eq_rs(ep_belong_id, timex, Equipment.OFFLINE) + if ep_monitored_id and is_rep_ep_running_state: set_eq_rs(ep_monitored_id, timex, Equipment.OFFLINE) - if ep_belong_id: - if is_rep_ep_running_state is False or 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 @@ -192,12 +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 and ep_belong_id != ep_monitored_id: + set_eq_rs(ep_belong_id, last_timex, Equipment.RUNING) 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: - if mpoint_is_rep_ep_running_state is False or ep_belong_id != ep_monitored_id: - set_eq_rs(ep_belong_id, last_timex, Equipment.RUNING) mf_code = current_cache_val.get('mpoint_affect')