فهرست منبع

新增设备uidset表增加设备类型字段

peng 2 سال پیش
والد
کامیت
22dd248743
3فایلهای تغییر یافته به همراه15 افزوده شده و 12 حذف شده
  1. 2 1
      Controller/EquipmentManagerV3.py
  2. 1 0
      Controller/SensorGateway/EquipmentFamilyController.py
  3. 12 11
      Model/models.py

+ 2 - 1
Controller/EquipmentManagerV3.py

@@ -169,7 +169,7 @@ class EquipmentManagerV3(View):
             nowTime = int(time.time())
             nowTime = int(time.time())
             us_qs = UidSetModel.objects.filter(uid=UID)
             us_qs = UidSetModel.objects.filter(uid=UID)
             if us_qs.exists():
             if us_qs.exists():
-                us_qs.update(nickname=NickName)
+                us_qs.update(nickname=NickName, device_type=Type)
                 UidSet_id = us_qs.first().id
                 UidSet_id = us_qs.first().id
             else:
             else:
                 ip = CommonService.get_ip_address(request)
                 ip = CommonService.get_ip_address(request)
@@ -184,6 +184,7 @@ class EquipmentManagerV3(View):
                     'nickname': NickName,
                     'nickname': NickName,
                     'version': version,
                     'version': version,
                     'region_alexa': region_alexa,
                     'region_alexa': region_alexa,
+                    'device_type': Type,
                 }
                 }
                 UidSet = UidSetModel.objects.create(**uid_set_create_dict)
                 UidSet = UidSetModel.objects.create(**uid_set_create_dict)
                 UidSet_id = UidSet.id
                 UidSet_id = UidSet.id

+ 1 - 0
Controller/SensorGateway/EquipmentFamilyController.py

@@ -206,6 +206,7 @@ class EquipmentFamilyView(View):
                         'ip': CommonService.get_ip_address(request_dict),
                         'ip': CommonService.get_ip_address(request_dict),
                         'nickname': nick_name,
                         'nickname': nick_name,
                         'region_alexa': region_alexa,
                         'region_alexa': region_alexa,
+                        'device_type': device_type
                     }
                     }
                     UidSetModel.objects.create(**uid_set_create_dict)
                     UidSetModel.objects.create(**uid_set_create_dict)
                 return response.json(0)
                 return response.json(0)

+ 12 - 11
Model/models.py

@@ -1192,6 +1192,7 @@ class UidSetModel(models.Model):
     is_notification = models.IntegerField(blank=True, default=1, verbose_name='新加-消息提醒开关')  # 0:关闭,1:开启
     is_notification = models.IntegerField(blank=True, default=1, verbose_name='新加-消息提醒开关')  # 0:关闭,1:开启
     new_detect_interval = models.IntegerField(blank=True, verbose_name='新加-消息提醒间隔', default=60)  # 秒
     new_detect_interval = models.IntegerField(blank=True, verbose_name='新加-消息提醒间隔', default=60)  # 秒
     tb_country = models.IntegerField(blank=True, default=0, verbose_name='国家')
     tb_country = models.IntegerField(blank=True, default=0, verbose_name='国家')
+    device_type = models.SmallIntegerField(default=0, verbose_name='设备类型')
 
 
     class Meta:
     class Meta:
         db_table = 'uid_set'
         db_table = 'uid_set'
@@ -2916,8 +2917,8 @@ class DeviceUserSummary(models.Model):
     time = models.IntegerField(verbose_name='时间戳', default=0, db_index=True)
     time = models.IntegerField(verbose_name='时间戳', default=0, db_index=True)
     query_type = models.SmallIntegerField(verbose_name='查询类型{0:新增用户,1:活跃用户}', default=0)
     query_type = models.SmallIntegerField(verbose_name='查询类型{0:新增用户,1:活跃用户}', default=0)
     count = models.IntegerField(verbose_name='总人数', default=0)
     count = models.IntegerField(verbose_name='总人数', default=0)
-    country = models.CharField(verbose_name='所属国家', max_length=255, default='')
-    continent = models.CharField(verbose_name='四大洲信息', max_length=255, default='')
+    country = models.CharField(verbose_name='所属国家', default='')
+    continent = models.CharField(verbose_name='四大洲信息', default='')
 
 
     def __str__(self):
     def __str__(self):
         return self.id
         return self.id
@@ -2935,9 +2936,9 @@ class OrdersSummary(models.Model):
     service_type = models.SmallIntegerField(verbose_name='增值服务类型{0:云存,1:AI,2:4G}', default=0)
     service_type = models.SmallIntegerField(verbose_name='增值服务类型{0:云存,1:AI,2:4G}', default=0)
     count = models.IntegerField(verbose_name='订单数量', default=0)
     count = models.IntegerField(verbose_name='订单数量', default=0)
     total = models.CharField(verbose_name='销售额', default='', max_length=16)
     total = models.CharField(verbose_name='销售额', default='', max_length=16)
-    country = models.CharField(verbose_name='所属国家', max_length=255, default='')
-    device_type = models.CharField(verbose_name='设备类型信息', max_length=255, default='')
-    store_meal = models.CharField(verbose_name='套餐信息', max_length=255, default='')
+    country = models.CharField(verbose_name='所属国家', default='')
+    device_type = models.CharField(verbose_name='设备类型信息', default='')
+    store_meal = models.CharField(verbose_name='套餐信息', default='')
 
 
     def __str__(self):
     def __str__(self):
         return self.id
         return self.id
@@ -2953,12 +2954,12 @@ class DeviceInfoSummary(models.Model):
     time = models.IntegerField(verbose_name='时间戳', default=0, db_index=True)
     time = models.IntegerField(verbose_name='时间戳', default=0, db_index=True)
     query_type = models.SmallIntegerField(verbose_name='查询类型{0:新增设备,1:活跃设备}', default=0)
     query_type = models.SmallIntegerField(verbose_name='查询类型{0:新增设备,1:活跃设备}', default=0)
     count = models.IntegerField(verbose_name='设备数量', default=0)
     count = models.IntegerField(verbose_name='设备数量', default=0)
-    country = models.CharField(verbose_name='所属国家', max_length=255, default='')
-    continent = models.CharField(verbose_name='四大洲信息', max_length=255, default='')
-    device_type = models.CharField(verbose_name='设备类型信息', max_length=255, default='')
-    vod_service = models.CharField(verbose_name='云存服务信息', max_length=255, default='')
-    ai_service = models.CharField(verbose_name='ai服务信息', max_length=255, default='')
-    unicom_service = models.CharField(verbose_name='联通服务信息', max_length=255, default='')
+    country = models.CharField(verbose_name='所属国家',  default='')
+    continent = models.CharField(verbose_name='四大洲信息', default='')
+    device_type = models.CharField(verbose_name='设备类型信息', default='')
+    vod_service = models.CharField(verbose_name='云存服务信息', default='')
+    ai_service = models.CharField(verbose_name='ai服务信息', default='')
+    unicom_service = models.CharField(verbose_name='联通服务信息', default='')
 
 
     def __str__(self):
     def __str__(self):
         return self.id
         return self.id