From 3729c255e732a8fb50eaf9cddedddb5368005b23 Mon Sep 17 00:00:00 2001
From: xianfuxing <xianfuxing@126.com>
Date: Mon, 30 Jul 2018 11:51:33 +0800
Subject: [PATCH] # up counter database

---
 apps/counter/api/serializers.py |  0
 apps/counter/api/views.py       |  0
 apps/counter/models.py          | 43 +++++++++++++++++++++++++++------
 mosqkiller/settings.py          |  3 +++
 4 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 apps/counter/api/serializers.py
 create mode 100644 apps/counter/api/views.py

diff --git a/apps/counter/api/serializers.py b/apps/counter/api/serializers.py
new file mode 100644
index 0000000..e69de29
diff --git a/apps/counter/api/views.py b/apps/counter/api/views.py
new file mode 100644
index 0000000..e69de29
diff --git a/apps/counter/models.py b/apps/counter/models.py
index e9eff08..b51f34f 100644
--- a/apps/counter/models.py
+++ b/apps/counter/models.py
@@ -10,14 +10,43 @@ from django.db import models
 
 
 class DeviceCount(models.Model):
-    device_id = models.CharField(max_length=45, blank=True, null=True)
-    csq = models.CharField(max_length=45, blank=True, null=True)
-    count = models.CharField(max_length=45, blank=True, null=True)
-    vol = models.CharField(max_length=45, blank=True, null=True)
-    data_time = models.DateTimeField(blank=True, null=True)
-    longitude = models.FloatField(blank=True, null=True)
-    latitude = models.FloatField(blank=True, null=True)
+    device_id = models.CharField(max_length=45, blank=True, null=True, verbose_name='设备ID')
+    csq = models.CharField(max_length=45, blank=True, null=True, verbose_name='信号强度')
+    count = models.CharField(max_length=45, blank=True, null=True, verbose_name='蚊子计数')
+    vol = models.CharField(max_length=45, blank=True, null=True, verbose_name='电量')
+    data_time = models.DateTimeField(blank=True, null=True, verbose_name='计数时间')
+    longitude = models.FloatField(blank=True, null=True, verbose_name='经度')
+    latitude = models.FloatField(blank=True, null=True, verbose_name='维度')
 
     class Meta:
         managed = False
         db_table = 'device_count'
+        app_label = 'counter'
+        verbose_name = '设备数据'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return self.device_id
+
+
+class DeviceInfo(models.Model):
+    device_id = models.CharField(primary_key=True, max_length=16, verbose_name='设备ID')
+    device_name = models.CharField(max_length=100, blank=True, null=True, verbose_name='设备名称')
+    chip_type = models.CharField(max_length=30, blank=True, null=True, verbose_name='芯片类型')
+    chip_id = models.CharField(max_length=50, blank=True, null=True, verbose_name='芯片ID')
+    compile_time = models.DateTimeField(blank=True, null=True, verbose_name='编译时间')
+    main_server_ip = models.CharField(max_length=15, blank=True, null=True, verbose_name='主服务器IP')
+    main_server_port = models.IntegerField(blank=True, null=True, verbose_name='主服务器端口')
+    maintain_server_ip = models.CharField(max_length=15, blank=True, null=True, verbose_name='备用服务器IP')
+    maintain_server_port = models.IntegerField(blank=True, null=True, verbose_name='备用服务器端口')
+    last_connect = models.DateTimeField(blank=True, null=True, verbose_name='最后连接时间')
+
+    class Meta:
+        managed = False
+        db_table = 'device_info'
+        app_label = 'counter'
+        verbose_name = '设备信息'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return self.device_name
diff --git a/mosqkiller/settings.py b/mosqkiller/settings.py
index c881782..893fb91 100644
--- a/mosqkiller/settings.py
+++ b/mosqkiller/settings.py
@@ -44,6 +44,7 @@ INSTALLED_APPS = [
     'accounts',
     'mosquito',
     'smart',
+    'counter',
 ]
 
 MIDDLEWARE = [
@@ -112,6 +113,8 @@ DATABASE_APPS_MAPPING = {
     'counter': 'counter'
 }
 
+DATABASE_ROUTERS = ['mosqkiller.database_router.DatabaseAppsRouter']
+
 # Password validation
 # https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators