添加宸云完整uid字段，上传增加判断

Controller/SerialNumberController.py

@@ -257,8 +257,8 @@ class SerialNumberView(View):
                                 if dev.exists():
                                     dev.update(serial_number=serial_number)
 
-
                                 res = {
+                                    'full_uid_code': CommonService.encode_data(uid.full_uid_code),
                                     'uid': CommonService.encode_data(uid.uid),
                                     'mac': CommonService.encode_data(uid.mac),
                                     'extra': uid.uid_extra
@@ -271,8 +271,9 @@ class SerialNumberView(View):
                     else:
                         uid_qs = UIDCompanySerialModel.objects.filter(company_serial_id=company_serial.id)
                         if uid_qs.exists():
-                            uid = uid_qs.values('uid__uid', 'uid__mac', 'uid__uid_extra')[0]
+                            uid = uid_qs.values('uid__uid', 'uid__mac', 'uid__uid_extra', 'uid__full_uid_code')[0]
                             res = {
+                                'full_uid_code': CommonService.encode_data(uid['uid__full_uid_code']),
                                 'uid': CommonService.encode_data(uid['uid__uid']),
                                 'mac': CommonService.encode_data(uid['uid__mac']),
                                 'extra': uid['uid__uid_extra']

Controller/VPGController.py

@@ -232,7 +232,6 @@ def do_upload_uid(request):
             uid_list = re.findall("b\'(.*)\'", str(chunk))[0].split('\\r\\n')
             for uid in uid_list:
                 UID = UIDModel(
-                    uid=uid,
                     mac=current_mac,
                     uid_extra='',
                     status=0,
@@ -243,8 +242,16 @@ def do_upload_uid(request):
                 )
                 if len(uid) == 14:  # 宸云
                     UID.p2p_type = 1
+                    UID.uid = uid
                 elif len(uid) == 20:    # tutk
                     UID.p2p_type = 2
+                    UID.uid = uid
+                elif len(uid) == 23:    # 宸云完整uid
+                    a = uid.split('-')
+                    new_uid = a[0] + a[1] + a[2].split(',')[0]
+                    UID.p2p_type = 1
+                    UID.uid = new_uid
+                    UID.full_uid_code = uid
                 bulk.append(UID)
                 temp_mac = CommonService.updateMac(current_mac)    # mac地址值+1;后3个字节为FF时返回None
                 if temp_mac:

Model/models.py

@@ -1346,6 +1346,7 @@ class UIDModel(models.Model):
     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')
+    full_uid_code = models.CharField(max_length=256, default='', verbose_name='宸云完整uid')
 
     class Meta:
         ordering = ('-add_time',)