Browse Source

上传uid添加设备初始化字符

locky 4 years ago
parent
commit
bd2dc0b08a
2 changed files with 13 additions and 3 deletions
  1. 10 3
      Controller/VPGController.py
  2. 3 0
      Model/models.py

+ 10 - 3
Controller/VPGController.py

@@ -209,6 +209,12 @@ def do_upload_uid(request):
         return response.json(444)
         return response.json(444)
     file = request.FILES.get('file', None)
     file = request.FILES.get('file', None)
     vpg_id = request_dict.get('vpg_id', None)
     vpg_id = request_dict.get('vpg_id', None)
+    platform = request_dict.get('platform', None)
+    init_string = request_dict.get('init_string', None)
+    init_string_app = request_dict.get('init_string_app', None)
+
+    if not all([vpg_id, platform, init_string, init_string_app]):
+        return response.json(444)
 
 
     bulk = []
     bulk = []
     add_time = update_time = int(time.time())
     add_time = update_time = int(time.time())
@@ -217,9 +223,7 @@ def do_upload_uid(request):
     if (not MAC['is_active']) or (current_mac[-8:] == 'FF.FF.FF'):
     if (not MAC['is_active']) or (current_mac[-8:] == 'FF.FF.FF'):
         return response.json(175)
         return response.json(175)
 
 
-    area = 0
-    if vpg_id != 1:
-        area = 1
+    area = 1 if vpg_id != '1' else 0
     # path = '/'.join((BASE_DIR, 'static/uid')).replace('\\', '/') + '/'
     # path = '/'.join((BASE_DIR, 'static/uid')).replace('\\', '/') + '/'
     # if not os.path.exists(path):
     # if not os.path.exists(path):
     #     os.makedirs(path)
     #     os.makedirs(path)
@@ -242,6 +246,9 @@ def do_upload_uid(request):
                     update_time=update_time,
                     update_time=update_time,
                     area=area,  # 关联vgp表已有区域信息,可以考虑去掉
                     area=area,  # 关联vgp表已有区域信息,可以考虑去掉
                     vpg_id=vpg_id,
                     vpg_id=vpg_id,
+                    platform=platform,
+                    init_string=init_string,
+                    init_string_app=init_string_app
                 )
                 )
                 if len(uid) == 14:  # 宸云
                 if len(uid) == 14:  # 宸云
                     UID.p2p_type = 1
                     UID.p2p_type = 1

+ 3 - 0
Model/models.py

@@ -1350,6 +1350,9 @@ class UIDModel(models.Model):
     vpg = models.ForeignKey(VPGModel, to_field='id', default=1, on_delete=models.DO_NOTHING, verbose_name='关联VPG表的id')
     vpg = models.ForeignKey(VPGModel, to_field='id', default=1, on_delete=models.DO_NOTHING, verbose_name='关联VPG表的id')
     p2p_type = models.IntegerField(default=1, verbose_name='p2p类型。1:宸云,2:tutk')
     p2p_type = models.IntegerField(default=1, verbose_name='p2p类型。1:宸云,2:tutk')
     full_uid_code = models.CharField(max_length=256, default='', verbose_name='宸云完整uid')
     full_uid_code = models.CharField(max_length=256, default='', verbose_name='宸云完整uid')
+    platform = models.CharField(max_length=10, default='', verbose_name='平台')
+    init_string = models.CharField(max_length=256, default='', verbose_name='尚云设备初始化字符')
+    init_string_app = models.CharField(max_length=256, default='', verbose_name='尚云设备app初始化字符')
 
 
     class Meta:
     class Meta:
         ordering = ('-add_time',)
         ordering = ('-add_time',)