From 270096da2d19b355176b6da7a9536fc4530798e9 Mon Sep 17 00:00:00 2001 From: fxxian Date: Mon, 25 Mar 2024 22:53:18 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=E5=A4=AA=E9=98=B3?= =?UTF-8?q?=E8=83=BD=E7=8A=B6=E6=80=81=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0030_auto_20240325_1452.py | 43 +++++++++++++++++++ apps/mosquito/models.py | 11 +++-- 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 apps/mosquito/migrations/0030_auto_20240325_1452.py diff --git a/apps/mosquito/migrations/0030_auto_20240325_1452.py b/apps/mosquito/migrations/0030_auto_20240325_1452.py new file mode 100644 index 0000000..2f201ae --- /dev/null +++ b/apps/mosquito/migrations/0030_auto_20240325_1452.py @@ -0,0 +1,43 @@ +# Generated by Django 2.2.4 on 2024-03-25 14:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mosquito', '0029_auto_20240325_1933'), + ] + + operations = [ + migrations.AddField( + model_name='deviceinfo', + name='ambient_temp', + field=models.FloatField(blank=True, null=True, verbose_name='环境温度'), + ), + migrations.AddField( + model_name='deviceinfo', + name='daily_charge_capacity', + field=models.FloatField(blank=True, null=True, verbose_name='日充电量'), + ), + migrations.AddField( + model_name='deviceinfo', + name='daily_discharge_capacity', + field=models.FloatField(blank=True, null=True, verbose_name='日放电量'), + ), + migrations.AddField( + model_name='deviceinfo', + name='device_temp', + field=models.FloatField(blank=True, null=True, verbose_name='设备温度'), + ), + migrations.AddField( + model_name='mosqpost', + name='device_temp', + field=models.FloatField(blank=True, null=True, verbose_name='设备温度'), + ), + migrations.AlterField( + model_name='deviceinfo', + name='led_status', + field=models.CharField(choices=[('on', 'on'), ('off', 'off')], default='OFF', max_length=10, verbose_name='LED 状态'), + ), + ] diff --git a/apps/mosquito/models.py b/apps/mosquito/models.py index 4ed6850..0483399 100644 --- a/apps/mosquito/models.py +++ b/apps/mosquito/models.py @@ -10,6 +10,7 @@ class MosqPost(models.Model): solar_panels = models.CharField(max_length=100, blank=True, null=True, verbose_name='太阳能电压电流功率') ac_power = models.CharField(max_length=100, blank=True, null=True, verbose_name='AC电压电流功率') dc_power = models.CharField(max_length=100, blank=True, null=True, verbose_name='DC电压电流功率') + device_temp = models.FloatField(blank=True, null=True, verbose_name='设备温度') create_time = models.DateTimeField(auto_now_add=True, blank=True, null=True, verbose_name='创建时间') update_time = models.DateTimeField(auto_now=True, blank=True, null=True, verbose_name='更新时间') @@ -77,17 +78,21 @@ class DeviceInfo(models.Model): longitude = models.FloatField(blank=True, null=True, verbose_name='经度') latitude = models.FloatField(blank=True, null=True, verbose_name='维度') location = models.CharField(max_length=100, blank=True, null=True, verbose_name='地理位置') - led_status = models.CharField(max_length=10, choices=LED_CHOICE, default='off', verbose_name='LED 状态') led_lifetime = models.PositiveIntegerField(default=30000, verbose_name='LED 寿命') launch_time = models.DateTimeField(blank=True, null=True, verbose_name='第一次启动时间') - count = models.PositiveIntegerField(blank=True, null=True, verbose_name='蚊子计数') - # 太阳能 + # mqtt 数据 + count = models.PositiveIntegerField(blank=True, null=True, verbose_name='蚊子计数') + led_status = models.CharField(max_length=10, choices=LED_CHOICE, default='OFF', verbose_name='LED 状态') load = models.CharField(max_length=100, blank=True, null=True, verbose_name='负载电压电流功率') storage_battery = models.CharField(max_length=100, blank=True, null=True, verbose_name='电池电压电流功率') solar_panels = models.CharField(max_length=100, blank=True, null=True, verbose_name='太阳能电压电流功率') ac_power = models.CharField(max_length=100, blank=True, null=True, verbose_name='AC电压电流功率') dc_power = models.CharField(max_length=100, blank=True, null=True, verbose_name='DC电压电流功率') + device_temp = models.FloatField(blank=True, null=True, verbose_name='设备温度') + ambient_temp = models.FloatField(blank=True, null=True, verbose_name='环境温度') + daily_charge_capacity = models.FloatField(blank=True, null=True, verbose_name='日充电量') + daily_discharge_capacity = models.FloatField(blank=True, null=True, verbose_name='日放电量') org = models.ForeignKey(Org, verbose_name='所在组织', on_delete='PROTECT') weather_device_id = models.CharField(max_length=100, blank=True, null=True, verbose_name='气象台ID')