From c79cc14f46a84f8a10e5ee1df6cb2a9f5a9e6cc0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 11 Dec 2024 17:54:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mpoint=E5=A2=9E=E5=8A=A0is=5Frep=5Fep0?= =?UTF-8?q?=5Frunning=5Fstate=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0050_mpoint_is_rep_ep0_running_state.py | 18 ++++++++++++++++++ apps/enm/services.py | 3 ++- apps/mtm/models.py | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 apps/enm/migrations/0050_mpoint_is_rep_ep0_running_state.py diff --git a/apps/enm/migrations/0050_mpoint_is_rep_ep0_running_state.py b/apps/enm/migrations/0050_mpoint_is_rep_ep0_running_state.py new file mode 100644 index 00000000..bdfd566d --- /dev/null +++ b/apps/enm/migrations/0050_mpoint_is_rep_ep0_running_state.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2024-12-11 09:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('enm', '0049_enstat_ammonia_consume'), + ] + + operations = [ + migrations.AddField( + model_name='mpoint', + name='is_rep_ep0_running_state', + field=models.BooleanField(default=False, verbose_name='是否表示所属设备运行状态'), + ), + ] diff --git a/apps/enm/services.py b/apps/enm/services.py index ebf74492..e4f883ea 100644 --- a/apps/enm/services.py +++ b/apps/enm/services.py @@ -223,9 +223,10 @@ class MpointCache: # 下面开始更新设备信号 ep_belong_id = current_cache_val.get("ep_belong") ep_monitored_id = current_cache_val.get("ep_monitored") + mpoint_is_rep_ep0_running_state = current_cache_val.get("is_rep_ep0_running_state", False) if ep_monitored_id and mpoint_is_rep_ep_running_state and ep_belong_id != ep_monitored_id: set_eq_rs(ep_monitored_id, last_timex, last_mrs) - if ep_belong_id: + if ep_belong_id and mpoint_is_rep_ep0_running_state: set_eq_rs(ep_belong_id, last_timex, Equipment.RUNING) mf_code = current_cache_val.get("mpoint_affect") diff --git a/apps/mtm/models.py b/apps/mtm/models.py index ac76a2b6..dd358c4e 100644 --- a/apps/mtm/models.py +++ b/apps/mtm/models.py @@ -118,6 +118,7 @@ class Mgroup(CommonBModel): """ name = models.CharField('名称', max_length=50) + # code = models.CharField('标识', max_length=50, null=True, blank=True) cate = models.CharField( '分类', max_length=50, default='section', help_text='section/other') # section是工段 shift_rule = models.CharField('班次规则', max_length=10, default='默认')