序列号绑定uid不分配mac

Controller/SerialNumberController.py

@@ -132,7 +132,6 @@ class SerialNumberView(View):
         company_id = request_dict.get('company_id', None)
         token = request_dict.get('token', None)
         time_stamp = request_dict.get('time_stamp', None)
-        DeviceSubType = request_dict.get('DeviceSubType', None)
         p2ptype = request_dict.get('p2ptype', 1)
         if not all([serial_number, company_id, token, time_stamp]):
             return response.json(444)
@@ -179,22 +178,6 @@ class SerialNumberView(View):
 
                         uid = uid_qs[0]
 
-                        if DeviceSubType:
-                            # 获取最新的mac，判断分配到哪里，且进行绑定
-                            mac = MacModel.objects.filter().values('id', 'value', 'is_active')[0]
-                            if not mac['is_active']:
-                                return response.json(175)
-                            current_mac = mac['value']
-                            UIDModel.objects.filter(id=uid.id).update(mac=current_mac)  # uid表写入mac值
-                            # 绑定mac地址成功后更新mac表
-                            temp_mac = CommonService.updateMac(current_mac)  # mac地址值+1;后3个字节为FF时返回None
-                            if temp_mac:
-                                MacModel.objects.filter().update(value=temp_mac, update_time=now_time)  # 更新mac表的mac地址值
-                            else:
-                                MacModel.objects.filter().update(is_active=False, update_time=now_time)
-                        else:
-                            current_mac = ''
-
                         result = UIDModel.objects.filter(id=uid.id, status=0).update(status=2, update_time=now_time)
                         if int(result) <= 0:    # 更新失败
                             count += 1
@@ -218,7 +201,6 @@ class SerialNumberView(View):
                         res = {
                             'full_uid_code': CommonService.encode_data(full_uid_code),
                             'uid': CommonService.encode_data(uid.uid),
-                            'mac': CommonService.encode_data(current_mac),
                             'extra': uid.uid_extra,
                             'platform': uid.platform,
                             'initString': uid.init_string,
@@ -253,7 +235,6 @@ class SerialNumberView(View):
                 res = {
                     'full_uid_code': CommonService.encode_data(full_uid_code),
                     'uid': CommonService.encode_data(uid['uid__uid']),
-                    'mac': CommonService.encode_data(uid['uid__mac']),
                     'extra': uid['uid__uid_extra'],
                     'platform': uid['uid__platform'],
                     'initString': uid['uid__init_string'],