联通测试服，完善联通测试后台管理功能（卡套餐的编辑和添加）；添加app设备类型数据

AdminController/DeviceManagementController.py

@@ -72,9 +72,36 @@ class DeviceManagement(View):
                 return self.edit_app_device_type(request_dict, response)
             elif operation == 'deleteAppDeviceType':  # 删除app设备类型数据
                 return self.delete_app_device_type(request_dict, response)
+            elif operation == 'addAppDeviceType':# 添加app设备类型数据
+                return self.add_app_device_type(request_dict, response)
             else:
                 return response.json(444, 'operation')
 
+    @staticmethod
+    def add_app_device_type(request_dict, response):
+        # app_device_type表数据
+        model = request_dict.get('model', None)
+        type = request_dict.get('type', None)
+        icon = request_dict.get('icon', None)
+        # device_name_language表数据
+        lang = request_dict.get('lang', None)
+        name = request_dict.get('name', None)
+        sort = request_dict.get('sort', None)
+
+        if not all([model, type, icon, lang, name, sort]):
+            return response.json(444)
+        type = int(type)
+        model = int(model)
+
+        try:
+            with transaction.atomic():
+                app_device_qs = AppDeviceType.objects.create(model=model, type=type, icon=icon)
+                DeviceNameLanguage.objects.create(lang=lang, name=name, sort=sort, app_device_type_id=app_device_qs.id)
+            return response.json(0)
+        except Exception as e:
+            print(e)
+            return response.json(500, repr(e))
+
     @staticmethod
     def get_device_info_list(request_dict, response):
         pageNo = request_dict.get('pageNo', None)

AdminController/UnicomManageController.py

@@ -211,7 +211,7 @@ class UnicomComboView(View):
             data_list = []
             for combo_order in combo_order_info_qs:
                 data = {'nickName': '',
-                        'serialNo':'',
+                        'serialNo': '',
                         'iccid': combo_order.iccid,
                         'status': combo_order.status,
                         'order_id': combo_order.order_id,
@@ -270,6 +270,16 @@ class UnicomComboView(View):
         is_show = int(is_show)
         sort = int(sort)
 
+        if combo_type == 1:
+            combo_type_qs = UnicomCombo.objects.filter(combo_type=1, is_del=False)
+            if combo_type_qs.exists():
+                if combo_id:
+                    combo_id = int(combo_id)
+                    combo_type_qs = combo_type_qs.first().id
+                    if combo_id != combo_type_qs.first().id:
+                        return response.json(174)
+                else:
+                    return response.json(174)
         unicom_combo_qs = UnicomCombo.objects.all()
 
         try: