Browse Source

UID管理系统-VPG管理-上传UID,对UID长度判断进行p2p分类,相应类型序列号绑定相应类型UID

lhq 4 years ago
parent
commit
687800ffd9
3 changed files with 11 additions and 5 deletions
  1. 1 1
      Controller/SerialNumberController.py
  2. 9 4
      Controller/VPGController.py
  3. 1 0
      Model/models.py

+ 1 - 1
Controller/SerialNumberController.py

@@ -247,7 +247,7 @@ class SerialNumberView(View):
                             p2p = SerialNumberModel.objects.filter(serial_number=serial).values('p2p')
                             print('此序列号的p2p类型:', p2p[0]['p2p'])
                             uid_qs = UIDModel.objects.filter(vpg__company_id=company_serial.company.id, vpg__region_id=region['region_id'],
-                                                             status=0)
+                                                             status=0, p2p_type=p2p[0]['p2p']).order_by('id')[0:10]
                             # uid_qs:未进行绑定的uid列表
                             if uid_qs.exists():
                                 uid = uid_qs[0]

+ 9 - 4
Controller/VPGController.py

@@ -231,16 +231,21 @@ def do_upload_uid(request):
             # print('str(chunk):', str_chunk)
             uid_list = re.findall("b\'(.*)\'", str(chunk))[0].split('\\r\\n')
             for uid in uid_list:
-                bulk.append(UIDModel(
+                UID = UIDModel(
                     uid=uid,
                     mac=current_mac,
                     uid_extra='',
                     status=0,
                     add_time=add_time,
                     update_time=update_time,
-                    area=0, # 关联vgp表已有区域信息,可以考虑去掉
-                    vpg_id=vpg_id
-                ))
+                    area=0,  # 关联vgp表已有区域信息,可以考虑去掉
+                    vpg_id=vpg_id,
+                )
+                if len(uid) == 14:  # 宸云
+                    UID.p2p_type = 1
+                elif len(uid) == 20:    # tutk
+                    UID.p2p_type = 2
+                bulk.append(UID)
                 temp_mac = CommonService.updateMac(current_mac)    # mac地址值+1;后3个字节为FF时返回None
                 if temp_mac:
                     current_mac = temp_mac  # 更新赋值写入uid表

+ 1 - 0
Model/models.py

@@ -1345,6 +1345,7 @@ class UIDModel(models.Model):
     update_time = models.IntegerField(default=0, verbose_name='更新时间')
     area = models.SmallIntegerField(default=0, verbose_name='区域')  #0:国内;1:国外
     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')
 
     class Meta:
         ordering = ('-add_time',)