From f52b501aa1609a08e5bd5c21bd84c388d6e66372 Mon Sep 17 00:00:00 2001 From: zty Date: Thu, 15 Aug 2024 09:19:19 +0800 Subject: [PATCH] =?UTF-8?q?feat=20:=20enm/service=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E9=87=87=E9=9B=86=E7=B3=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/migrations/0041_mpoint_coefficient.py | 18 ++++++++++++++++++ apps/enm/models.py | 1 + apps/enm/services.py | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 apps/enm/migrations/0041_mpoint_coefficient.py diff --git a/apps/enm/migrations/0041_mpoint_coefficient.py b/apps/enm/migrations/0041_mpoint_coefficient.py new file mode 100644 index 00000000..476ba3ab --- /dev/null +++ b/apps/enm/migrations/0041_mpoint_coefficient.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2024-08-15 01:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('enm', '0040_mpoint_is_unit'), + ] + + operations = [ + migrations.AddField( + model_name='mpoint', + name='coefficient', + field=models.FloatField(default=1.0, verbose_name='系数'), + ), + ] diff --git a/apps/enm/models.py b/apps/enm/models.py index 7998e633..1bf71efa 100644 --- a/apps/enm/models.py +++ b/apps/enm/models.py @@ -41,6 +41,7 @@ class Mpoint(CommonBModel): need_display = models.BooleanField("是否需要展示", default=False) report_sortstr = models.CharField('在报告中的排序', max_length=50, default='', blank=True) + coefficient = models.FloatField("系数", default=1.0) @classmethod def cache_key(cls, code: str): diff --git a/apps/enm/services.py b/apps/enm/services.py index 239d87de..9958351f 100644 --- a/apps/enm/services.py +++ b/apps/enm/services.py @@ -176,7 +176,7 @@ class MpointCache: current_cache_val = self.data cache_key = self.cache_key last_data = current_cache_val["last_data"] - last_data["last_val"] = last_val + last_data["last_val"] = last_val*current_cache_val.get('coefficient', 1) last_data["last_timex"] = last_timex last_mrs = None # 设备状态信号 mpoint_is_rep_ep_running_state = current_cache_val["is_rep_ep_running_state"]