Browse Source

添加一个字段

pengzhibo168 5 years ago
parent
commit
d0c746d952
3 changed files with 7 additions and 8 deletions
  1. 2 2
      Controller/UidSetController.py
  2. 4 4
      Controller/UserController.py
  3. 1 2
      Model/models.py

+ 2 - 2
Controller/UidSetController.py

@@ -291,13 +291,13 @@ class UidSetView(View):
 
     def do_update(self, request_dict, response):
         uid = request_dict.get('uid', None)
-        alexa_region = request_dict.get('alexa_region', None)
+        region_alexa = request_dict.get('region_alexa', None)
         is_alexa = request_dict.get('is_alexa', None)
         try:
             timestamp = int(time.time())
             uid_set = UidSetModel.objects.filter(uid=uid)
             if uid_set.exists():
-                uid_set.update(updTime=timestamp,alexa_region=alexa_region,is_alexa=is_alexa )
+                uid_set.update(updTime=timestamp,region_alexa=region_alexa,is_alexa=is_alexa )
                 return response.json(0)
             else:
                 return response.json(173)

+ 4 - 4
Controller/UserController.py

@@ -2092,12 +2092,12 @@ class alexaUidView(TemplateView):
             uid_arr = []
             for us in us_qs:
                 uid = us['uid']
-                alexa_region = us['alexa_region']
-                if alexa_region == '':
-                    alexa_region = "en"
+                region_alexa = us['region_alexa']
+                if region_alexa == '':
+                    region_alexa = "en"
                 # uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'password': uid_dict['uid']['password']})
                 uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'password': uid_dict[uid]['password'],
-                                'region': alexa_region})
+                                'region': region_alexa})
             res = {
                 'uid_arr': uid_arr
             }

+ 1 - 2
Model/models.py

@@ -648,8 +648,7 @@ class UidSetModel(models.Model):
     pwd = models.CharField(max_length=32, default='', verbose_name=u'设备密码')
     resetTime = models.IntegerField(default=0, verbose_name='设备重置时间')
     detect_group = models.CharField(default='', max_length=10, verbose_name=u'检测类型')
-    alexa_region = models.CharField(max_length=64, default='area', verbose_name='设备alexa区域')
-
+    region_alexa = models.CharField(max_length=8, verbose_name='设备alexa区域', default='ALL')  # ALL CN EU US
     class Meta:
         db_table = 'uid_set'
         verbose_name = u'设备配置表'