PDU
/
Mosqkiller-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

# 添加device_name

This commit is contained in:
xianfuxing 2020-05-25 14:23:38 +08:00
parent 0fe9beb007
commit 5a45cd6a17
5 changed files with 123 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/counter/api/serializers.py
View File

@ -4,6 +4,7 @@ from datetime import datetime, time
from django.db.models import Sum
from rest_framework import serializers
from counter.models import DeviceCount, DeviceInfo
from mosquito.models import DeviceInfo as CelexDeviceInfo
from mosquito.models import MosqPostStatistic, DevicePostStatistic
@ -40,6 +41,7 @@ class DeviceCountSerializer(serializers.ModelSerializer):
class DeviceInfoSerializer(serializers.ModelSerializer):
device_name = serializers.SerializerMethodField()
status = serializers.SerializerMethodField()
count = serializers.SerializerMethodField()
signal = serializers.SerializerMethodField()
@ -64,6 +66,13 @@ class DeviceInfoSerializer(serializers.ModelSerializer):
super().__init__(*args, **kwargs)
self.latest = None
def get_device_name(self, obj):
qs = CelexDeviceInfo.objects.filter(device_id=obj.device_id)
if qs.count() > 0:
device = qs[0]
return device.device_name
return None
def get_status(self, obj):
return obj.online

2
apps/mosquito/admin.py
View File

@ -15,7 +15,7 @@ class MosqPostAdmin(admin.ModelAdmin):
class DeviceAdmin(admin.ModelAdmin):
list_display = ['device_id', 'org']
list_display = ['device_id', 'device_name', 'org']
list_filter = ['device_id', 'org']
ordering = ['device_id']

94
apps/mosquito/migrations/0012_deviceinfo_devicepoststatistic_mosqpost_mosqpoststatistic_mosquito_org.py Normal file
View File

@ -0,0 +1,94 @@
# Generated by Django 2.2.4 on 2020-05-25 06:13
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('smart', '__first__'),
('mosquito', '0011_auto_20190901_1020'),
]
operations = [
migrations.CreateModel(
name='MosqPostStatistic',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('total', models.PositiveIntegerField(verbose_name='总数')),
('increment', models.IntegerField(verbose_name='增量')),
('date', models.DateField(unique=True, verbose_name='日期')),
],
options={
'verbose_name': '统计报表',
'verbose_name_plural': '统计报表',
},
),
migrations.CreateModel(
name='Mosquito',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100, verbose_name='设备名称')),
('device_id', models.CharField(max_length=100, verbose_name='设备ID')),
('region', models.CharField(max_length=50, verbose_name='区域')),
],
options={
'verbose_name': '灭蚊灯',
'verbose_name_plural': '灭蚊灯',
},
),
migrations.CreateModel(
name='Org',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100, verbose_name='组织名称')),
('code', models.CharField(max_length=10, verbose_name='组织代码')),
('desc', models.CharField(blank='True', max_length=100, verbose_name='描述')),
],
options={
'verbose_name': '客户组织',
'verbose_name_plural': '客户组织',
},
),
migrations.CreateModel(
name='MosqPost',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('led', models.PositiveIntegerField(verbose_name='灭蚊数')),
('energy', models.PositiveIntegerField(verbose_name='电量')),
('time', models.DateTimeField(auto_now_add=True)),
('mosq', models.ForeignKey(on_delete='PROTECT', to='mosquito.Mosquito', verbose_name='灭蚊灯')),
('smart_push', models.ForeignKey(on_delete='PROTECT', to='smart.SmartPush')),
],
options={
'verbose_name': '灭蚊数据',
'verbose_name_plural': '灭蚊数据',
},
),
migrations.CreateModel(
name='DevicePostStatistic',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('device_id', models.CharField(max_length=100, verbose_name='设备ID')),
('total', models.PositiveIntegerField(verbose_name='总数')),
('date', models.DateField(verbose_name='日期')),
('org', models.ForeignKey(on_delete='PROTECT', to='mosquito.Org', verbose_name='所在组织')),
],
options={
'verbose_name': '设备日志统计表',
'verbose_name_plural': '设备日志统计表',
},
),
migrations.CreateModel(
name='DeviceInfo',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('device_id', models.CharField(max_length=100, unique=True, verbose_name='设备ID')),
('org', models.ForeignKey(on_delete='PROTECT', to='mosquito.Org', verbose_name='所在组织')),
],
options={
'verbose_name': '灭蚊灯设备',
'verbose_name_plural': '灭蚊灯设备',
},
),
]

18
apps/mosquito/migrations/0013_deviceinfo_device_name.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.4 on 2020-05-25 06:13
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('mosquito', '0012_deviceinfo_devicepoststatistic_mosqpost_mosqpoststatistic_mosquito_org'),
]
operations = [
migrations.AddField(
model_name='deviceinfo',
name='device_name',
field=models.CharField(blank=True, max_length=100, null=True, verbose_name='设备名称'),
),
]

1
apps/mosquito/models.py
View File

@ -86,6 +86,7 @@ class Org(models.Model):
class DeviceInfo(models.Model):
device_id = models.CharField(max_length=100, unique=True, verbose_name='设备ID')
device_name = models.CharField(max_length=100, blank=True, null=True, verbose_name='设备名称')
org = models.ForeignKey(Org, verbose_name='所在组织', on_delete='PROTECT')
class Meta: