From cb1576b79700c51c8cb35ef2f0bc1001ccce3a6b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 6 May 2024 18:13:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E9=87=8F=E8=AE=A1=E7=AE=97=E6=B5=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/services.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/enm/services.py b/apps/enm/services.py index 49839e7f..0749ec5c 100644 --- a/apps/enm/services.py +++ b/apps/enm/services.py @@ -177,14 +177,6 @@ class MpointCache: save_dict[f"val_{current_cache_val['val_type']}"] = last_val MpLogx.objects.create(**save_dict) - mf_code = current_cache_val.get('mpoint_affect') - if mf_code: # 如果该测点影响到另一个测点，要同步更新另一个测点 - mc = MpointCache(mf_code) - mf_data = mc.data - # 只有自采测点才可影响计算测点只针对开关信号 - if mf_data and current_cache_val['type'] == Mpoint.MT_AUTO and mf_data['type'] == Mpoint.MT_COMPUTE and mf_data['is_rep_ep_running_state'] and mf_data['ep_rs_expr']: - mc.set(last_timex, None) - # 下面开始更新设备信号 ep_belong_id = current_cache_val.get("ep_belong") ep_monitored_id = current_cache_val.get("ep_monitored") @@ -194,6 +186,15 @@ class MpointCache: if ep_monitored_id and mpoint_is_rep_ep_running_state: set_eq_rs(ep_monitored_id, last_timex, last_mrs) + mf_code = current_cache_val.get('mpoint_affect') + if mf_code: # 如果该测点影响到另一个测点，要同步更新另一个测点 + mc = MpointCache(mf_code) + mf_data = mc.data + # 只有自采测点才可影响计算测点只针对开关信号 + if mf_data and current_cache_val['type'] == Mpoint.MT_AUTO and mf_data['type'] == Mpoint.MT_COMPUTE and mf_data['is_rep_ep_running_state'] and mf_data['ep_rs_expr']: + mc.set(last_timex, None) + + def king_sync(projectName: str, json_path: str = ""): """ 同步亚控测点