查询app设备类型图标数据根据sort排序

AdminController/DeviceManagementController.py

@@ -358,7 +358,8 @@ class DeviceManagement(View):
                                                      app_device_type__devicenamelanguage__lang=lang).annotate(
                 model=F('app_device_type__model'), type=F('app_device_type__type'), icon=F('app_device_type__icon'),
                 name=F('app_device_type__devicenamelanguage__name'),
-                sort=F('app_device_type__devicenamelanguage__sort')).values('model', 'type', 'icon', 'name', 'sort')
+                sort=F('app_device_type__devicenamelanguage__sort')).order_by(
+                'app_device_type__devicenamelanguage__sort').values('model', 'type', 'icon', 'name', 'sort')
             dvr_list = [app_bundle for app_bundle in app_bundle_qs if app_bundle['model'] == 1]
             ipc_list = [app_bundle for app_bundle in app_bundle_qs if app_bundle['model'] == 2]
             print(dvr_list, ipc_list)
@@ -374,7 +375,7 @@ class DeviceManagement(View):
     @staticmethod
     def get_app_device_type_list(request_dict, response):
         lang = request_dict.get('lang', 'cn')
-        app_bundle_id = request_dict.get('appBundleId', None)
+        app_bundle_id = request_dict.get('appBundleId', 'com.ansjer.zccloud')
         pageNo = request_dict.get('pageNo', None)
         pageSize = request_dict.get('pageSize', None)
 
@@ -393,9 +394,10 @@ class DeviceManagement(View):
             total = app_bundle_qs.count()
             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('model', 'type', 'icon', 'name', 'sort')[
-                            (page - 1) * line:page * line]
+                sort=F('app_device_type__devicenamelanguage__sort')).values('model', 'type', 'icon', 'lang', 'name',
+                                                                            'sort')[(page - 1) * line:page * line]
             if not app_bundle_qs.exists():
                 return response.json(173)
             app_device_type_list = [app_bundle for app_bundle in app_bundle_qs]