From a46cfe59eda580392ab0c7039cc7bdaad578a8d2 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 6 May 2024 00:05:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0mpoint=5Faffect?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0032_mpoint_mpoint_affect.py | 19 +++++++++++++++++++ apps/enm/models.py | 6 ++---- 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 apps/enm/migrations/0032_mpoint_mpoint_affect.py diff --git a/apps/enm/migrations/0032_mpoint_mpoint_affect.py b/apps/enm/migrations/0032_mpoint_mpoint_affect.py new file mode 100644 index 00000000..9f5858e2 --- /dev/null +++ b/apps/enm/migrations/0032_mpoint_mpoint_affect.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.12 on 2024-05-05 16:04 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('enm', '0031_auto_20240428_0906'), + ] + + operations = [ + migrations.AddField( + model_name='mpoint', + name='mpoint_affect', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='mp_mpoint_affect', to='enm.mpoint', to_field='code', verbose_name='影响测点'), + ), + ] diff --git a/apps/enm/models.py b/apps/enm/models.py index 0a8804b5..ae450b1a 100644 --- a/apps/enm/models.py +++ b/apps/enm/models.py @@ -33,18 +33,16 @@ class Mpoint(CommonBModel): third_info = models.JSONField("第三方信息", default=dict, blank=True) # {"from": "king", "n": "某名称","d": "某描述或备注","g": "某组", "t": "某类型", "id": 5001, "o": "其他信息"} enp_field = models.CharField("关联enp采集字段", max_length=50, null=True, blank=True) + is_rep_ep_running_state = models.BooleanField("是否表示所监测设备运行状态", default=False) ep_monitored = models.ForeignKey("em.equipment", verbose_name="所监测设备", related_name="mp_ep_monitored", on_delete=models.SET_NULL, null=True, blank=True) ep_rs_val = models.FloatField("状态量基准值", null=True, blank=True) ep_rs_expr = models.TextField("状态量表达式", null=True, blank=True) + mpoint_affect = models.ForeignKey("self", verbose_name="影响测点", related_name="mp_mpoint_affect", on_delete=models.SET_NULL, null=True, blank=True, to_field='code') need_display = models.BooleanField("是否需要展示", default=False) report_sortstr = models.CharField('在报告中的排序', max_length=50, default='', blank=True) - @classmethod - def cache_key(cls, code: str): - return f"mpoint_{code}" - class MpLogx(models.Model): """