修改4G绑定设备接口

Controller/UnicomCombo/UnicomComboController.py

@@ -401,40 +401,46 @@ class UnicomComboView(View):
         n_time = int(time.time())
         try:
             logger.info('--->参数验证通过，sign验证通过')
-            with transaction.atomic():
-                ip = CommonService.get_ip_address(request)
-                # 待完善代码 根据uid与用户id验证系统设备mdcmd
-                unicom_device_qs = UnicomDeviceInfo.objects.filter(iccid=iccid)
-                if unicom_device_qs.exists():
-                    if unicom_device_qs.first().serial_no != serial_no:
-                        unicom_device_qs.update(main_card=sim, updated_time=n_time, serial_no=serial_no)
-                        cls.create_operation_log('unicom/api/device-bind',
-                                                 ip, request_dict, '4G序列号{}新绑定{}'.format(serial_no, iccid))
-                    elif unicom_device_qs.first().main_card != sim:
-                        unicom_device_qs.update(main_card=sim, updated_time=n_time)
-                    return response.json(0)
-                if sim == 0:
-                    return response.json(0, '外置卡不保存相关信息{}'.format(serial_no))
-                params = {'iccid': iccid, 'serial_no': serial_no, 'updated_time': n_time,
-                          'created_time': n_time, 'main_card': sim}
-                if cls.is_unicom_sim(iccid):  # 联通卡
-                    UnicomDeviceInfo.objects.create(**params)
+            ip = CommonService.get_ip_address(request)
+            # 待完善代码 根据uid与用户id验证系统设备mdcmd
+            unicom_device_qs = UnicomDeviceInfo.objects.filter(iccid=iccid)
+            if unicom_device_qs.exists():
+                if unicom_device_qs.first().serial_no != serial_no:
+                    unicom_device_qs.update(main_card=sim, updated_time=n_time, serial_no=serial_no)
                     cls.create_operation_log('unicom/api/device-bind',
-                                             ip, request_dict, '4G序列号{}绑定{}'.format(serial_no, iccid))
-                    return response.json(0)
-                elif cls.is_dingxin_iot(iccid):  # 鼎芯物联卡
-                    params['card_type'] = 5  # 国际
-                    params['status'] = 2
-                    UnicomDeviceInfo.objects.create(**params)
-                    return response.json(0)
-                elif cls.check_iccid(iccid):  # 五兴物联卡
-                    params['card_type'] = 1
+                                             ip, request_dict, '4G序列号{}新绑定{}'.format(serial_no, iccid))
+                elif unicom_device_qs.first().main_card != sim:
+                    unicom_device_qs.update(main_card=sim, updated_time=n_time)
+                return response.json(0)
+            params = {'iccid': iccid, 'serial_no': serial_no, 'updated_time': n_time,
+                      'created_time': n_time, 'main_card': sim}
+            if sim == 0:
+                if cls.is_dingxin_iot(iccid):  # 鼎芯物联卡
+                    params['card_type'] = 5
                     params['status'] = 2
                     UnicomDeviceInfo.objects.create(**params)
-                    return response.json(0)
-                else:
-                    logger.info('--->设备请求绑定{}验证失败'.format(iccid))
-                    return response.json(173)
+                    cls.create_operation_log('unicom/api/device-bind',
+                                             ip, request_dict, '4G序列号{}新绑定鼎芯{}'.format(serial_no, iccid))
+                return response.json(0, '外置卡不保存相关信息{}'.format(serial_no))
+
+            if cls.is_unicom_sim(iccid):  # 联通卡
+                UnicomDeviceInfo.objects.create(**params)
+                cls.create_operation_log('unicom/api/device-bind',
+                                         ip, request_dict, '4G序列号{}绑定{}'.format(serial_no, iccid))
+                return response.json(0)
+            elif cls.is_dingxin_iot(iccid):  # 鼎芯物联卡
+                params['card_type'] = 5  # 国际
+                params['status'] = 2
+                UnicomDeviceInfo.objects.create(**params)
+                return response.json(0)
+            elif cls.check_iccid(iccid):  # 五兴物联卡
+                params['card_type'] = 1
+                params['status'] = 2
+                UnicomDeviceInfo.objects.create(**params)
+                return response.json(0)
+            else:
+                logger.info('--->设备请求绑定{}验证失败'.format(iccid))
+                return response.json(173)
         except Exception as e:
             print(e)
             ex = traceback.format_exc()