Merge branch 'master' of http://192.168.136.99:3000/servers/ASJServer

AdminController/DeviceManagementController.py

@@ -77,7 +77,7 @@ class DeviceManagement(View):
             elif operation == 'getAppBundleIdList':  # 获取app包id数据
                 return self.get_app_bundle_id_list(response)
             elif operation == 'editAppDeviceType':  # 编辑app设备类型数据
-                return self.edit_app_device_type(request_dict, response)
+                return self.edit_app_device_type(request_dict, request, response)
             elif operation == 'deleteAppDeviceType':  # 删除app设备类型数据
                 return self.delete_app_device_type(request_dict, response)
             elif operation == 'getAppBundle':  # 获取app版本包
@@ -161,14 +161,17 @@ class DeviceManagement(View):
                             device_info_list["datas"][k]['fields']['Type'] = device_type_qs[0]['name']
                         uid_set_qs = UidSetModel.objects.filter(
                             uid=device_info_list["datas"][k]['fields']['UID']).values('is_alexa', 'ip', 'version',
-                                                                                      'is_ai', 'is_human', 'cloud_vod')
+                                                                                      'is_ai', 'is_human', 'cloud_vod',
+                                                                                      'ucode', 'device_type')
                         if uid_set_qs.exists():
                             isAlexa = '是' if uid_set_qs[0]['is_alexa'] else '否'
                             isHuman = '是' if uid_set_qs[0]['is_human'] else '否'
-                            if uid_set_qs[0]['cloud_vod'] == 2:
-                                cloud_vod = '不支持'
-                            else:
+                            cloud_vod = CommonService.is_cloud_device(uid_set_qs[0]['ucode'],
+                                                                      uid_set_qs[0]['device_type'])
+                            if cloud_vod:
                                 cloud_vod = '支持'
+                            else:
+                                cloud_vod = '不支持'
                             if uid_set_qs[0]['is_ai'] == 2:
                                 isAI = '不支持'
                             elif uid_set_qs[0]['is_ai'] == 1:
@@ -198,7 +201,7 @@ class DeviceManagement(View):
             return response.json(0, {'list': device_info_list, 'total': total})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     # 根据id删除设备
     def deleteDevice(self, request_dict, response):
@@ -219,7 +222,7 @@ class DeviceManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     # 重置设备主用户
     def resetPrimaryUser(self, request, request_dict, response):
@@ -243,7 +246,7 @@ class DeviceManagement(View):
             Device_Info.objects.filter(UID=uid).update(vodPrimaryUserID='', vodPrimaryMaster='')
             return response.json(0)
         except Exception as e:
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     # 重置设备云存
     def resetVod(self, request, request_dict, response):
@@ -279,7 +282,7 @@ class DeviceManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @staticmethod
     def reset_ai(request, request_dict, response):
@@ -307,7 +310,7 @@ class DeviceManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     # 获取设备类型数据
     def getDeviceTypeList(self, request_dict, response):
@@ -341,7 +344,7 @@ class DeviceManagement(View):
             return response.json(0, {'list': device_type_list, 'total': total})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     # 删除设备类型
     def deleteDeviceType(self, request_dict, response):
@@ -353,7 +356,7 @@ class DeviceManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     # 添加设备类型
     def addDeviceType(self, request, request_dict, response):
@@ -381,7 +384,7 @@ class DeviceManagement(View):
             return response.json(0)
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @staticmethod
     def del_device_data(request_dict, response):
@@ -463,7 +466,7 @@ class DeviceManagement(View):
     @staticmethod
     def get_app_device_type_list(request_dict, response):
         app_bundle_id = request_dict.get('app_bundle_id', None)
-        lang = request_dict.get('lang', 'cn')
+        lang = request_dict.get('lang', None)
         model = request_dict.get('model', None)
         type = request_dict.get('type', None)
         name = request_dict.get('name', None)
@@ -478,24 +481,23 @@ class DeviceManagement(View):
         line = int(pageSize)
 
         try:
-            if not app_bundle_id:
-                app_bundle_id = 'com.ansjer.zccloud'
-            app_bundle_qs = AppBundle.objects.filter(app_bundle_id=app_bundle_id)
+            app_bundle_qs = AppBundle.objects.all()
+            if app_bundle_id:
+                app_bundle_qs = app_bundle_qs.filter(app_bundle_id=app_bundle_id)
             if lang:
                 app_bundle_qs = app_bundle_qs.filter(app_device_type__devicenamelanguage__lang=lang)
-
             app_bundle_qs = app_bundle_qs.annotate(
                 model=F('app_device_type__model'), type=F('app_device_type__type'), icon=F('app_device_type__icon'),
                 lang=F('app_device_type__devicenamelanguage__lang'),
                 name=F('app_device_type__devicenamelanguage__name'),
                 sort=F('app_device_type__devicenamelanguage__sort')).values('id', 'app_device_type__id', 'model',
-                                                                            'type', 'icon',
+                                                                            'type', 'icon', 'app_bundle_id',
                                                                             'app_device_type__devicenamelanguage__id',
-                                                                            'lang', 'name', 'sort').order_by(
+                                                                            'lang', 'name', 'sort',
+                                                                            'app_device_type__app_version_number_id').order_by(
                 'app_device_type__devicenamelanguage__sort')
             if not app_bundle_qs.exists():
                 return response.json(0)
-            app_bundle_qs = app_bundle_qs.all()
             if name:
                 app_bundle_qs = app_bundle_qs.filter(name=name)
             if model:
@@ -504,11 +506,14 @@ class DeviceManagement(View):
                 app_bundle_qs = app_bundle_qs.filter(type=type)
             total = app_bundle_qs.count()
             app_bundle_qs = app_bundle_qs[(page - 1) * line:page * line]
-            app_device_type_list = [app_bundle for app_bundle in app_bundle_qs]
+            app_device_type_list = []
+            for app_bundle in app_bundle_qs:
+                app_bundle['version_number'] = app_bundle.pop('app_device_type__app_version_number_id')
+                app_device_type_list.append(app_bundle)
             return response.json(0, {'list': app_device_type_list, 'total': total})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @staticmethod
     def get_app_bundle_id_list(response):
@@ -518,7 +523,7 @@ class DeviceManagement(View):
             return response.json(0, {'list': appBundleIdList})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @staticmethod
     def edit_app_device_type(request_dict, request, response):