|
|
@@ -377,10 +377,7 @@ class DeviceManagement(View):
|
|
|
@staticmethod
|
|
|
def get_app_device_type_list(request_dict, response):
|
|
|
app_bundle_id = request_dict.get('appBundleId', 'com.ansjer.zccloud')
|
|
|
- model = request_dict.get('model', None)
|
|
|
- type = request_dict.get('type', None)
|
|
|
lang = request_dict.get('lang', 'cn')
|
|
|
- name = request_dict.get('name', None)
|
|
|
|
|
|
pageNo = request_dict.get('pageNo', None)
|
|
|
pageSize = request_dict.get('pageSize', None)
|
|
|
@@ -397,15 +394,17 @@ class DeviceManagement(View):
|
|
|
if lang:
|
|
|
app_bundle_qs = app_bundle_qs.filter(app_device_type__devicenamelanguage__lang=lang)
|
|
|
|
|
|
- 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', 'lang', 'name',
|
|
|
- 'sort')[(page - 1) * line:page * line]
|
|
|
+ 'sort').order_by(
|
|
|
+ 'app_device_type__devicenamelanguage__sort')
|
|
|
if not app_bundle_qs.exists():
|
|
|
return response.json(0)
|
|
|
+ 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]
|
|
|
return response.json(0, {'list': app_device_type_list, 'total': total})
|
|
|
except Exception as e:
|
