From 813301e7e11d7b97c4ff6d244624c68e40e86be7 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 11 Apr 2024 10:52:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=98=E6=9B=B4mpoint=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enm/migrations/0024_auto_20240326_1617.py | 19 +++++++++++++++++++ .../0026_alter_mpoint_func_on_change.py | 18 ++++++++++++++++++ apps/enm/models.py | 4 ++-- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 apps/enm/migrations/0026_alter_mpoint_func_on_change.py diff --git a/apps/enm/migrations/0024_auto_20240326_1617.py b/apps/enm/migrations/0024_auto_20240326_1617.py index 249aee12..89936acd 100644 --- a/apps/enm/migrations/0024_auto_20240326_1617.py +++ b/apps/enm/migrations/0024_auto_20240326_1617.py @@ -10,6 +10,25 @@ class Migration(migrations.Migration): ] operations = [ + migrations.RunSQL( + sql=[( + """ +CREATE TABLE public.enm_mplogx ( + "timex" timestamptz NOT NULL, + "mpoint_id" text NOT NULL, + "val_int" integer, + "val_float" float, + "val_bool" boolean, + "val_str" text, + CONSTRAINT enm_mplogx_pkey PRIMARY KEY (timex, mpoint_id) +); +SELECT create_hypertable('enm_mplogx', 'timex'); + """ + )], + reverse_sql=[ + "DROP TABLE IF EXISTS public.enm_mplogx;" + ] + ), migrations.CreateModel( name='MpLogx', fields=[ diff --git a/apps/enm/migrations/0026_alter_mpoint_func_on_change.py b/apps/enm/migrations/0026_alter_mpoint_func_on_change.py new file mode 100644 index 00000000..e87577ec --- /dev/null +++ b/apps/enm/migrations/0026_alter_mpoint_func_on_change.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2024-04-09 08:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('enm', '0025_mpoint_third_info'), + ] + + operations = [ + migrations.AlterField( + model_name='mpoint', + name='func_on_change', + field=models.CharField(blank=True, default='', max_length=100, verbose_name='数据变动时执行方法'), + ), + ] diff --git a/apps/enm/models.py b/apps/enm/models.py index 341a5d3a..39cbdfe1 100644 --- a/apps/enm/models.py +++ b/apps/enm/models.py @@ -19,7 +19,7 @@ class Mpoint(CommonBModel): is_auto = models.BooleanField('是否自动采集', default=True) is_all = models.BooleanField('是否记录是整个工段', default=False) formula = models.TextField('计算公式', default='') - func_on_change = models.CharField('数据变动时执行方法', max_length=100, default='') + func_on_change = models.CharField('数据变动时执行方法', max_length=100, default='', blank=True) interval = models.PositiveSmallIntegerField('采集间隔(秒)', default=10) val_type = models.CharField('值类型', default='float', max_length=50, help_text='float, int, str, bool') enabled = models.BooleanField('是否启用', default=False) @@ -39,7 +39,7 @@ class MpLogx(models.Model): val_str = models.CharField('数值', max_length=100, null=True, blank=True) class Meta: - db_table = 'enm_mplog' + db_table = 'enm_mplogx' managed = False unique_together = (('mpoint', 'timex'), )