|
@@ -11,7 +11,7 @@ from django.views.generic.base import View
|
|
|
from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
|
|
|
from Model.models import Device_Info, UidSetModel, LogModel, UID_Bucket, Unused_Uid_Meal, Order_Model, StsCrdModel, \
|
|
|
VodHlsModel, ExperienceContextModel, DeviceTypeModel, Equipment_Info, UidUserModel, ExperienceAiModel, AiService, \
|
|
|
- AppBundle
|
|
|
+ AppBundle, App_Info
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
from Service.CommonService import CommonService
|
|
@@ -66,6 +66,8 @@ class DeviceManagement(View):
|
|
|
return self.deleteDeviceType(request_dict, response)
|
|
|
elif operation == 'getAppDeviceTypeList': # 获取app设备类型数据
|
|
|
return self.get_app_device_type_list(request_dict, response)
|
|
|
+ elif operation == 'getAppBundleIdList': # 获取app包id数据
|
|
|
+ return self.get_app_bundle_id_list(response)
|
|
|
else:
|
|
|
return response.json(444, 'operation')
|
|
|
|
|
@@ -374,8 +376,12 @@ 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', '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)
|
|
|
|
|
@@ -399,9 +405,19 @@ class DeviceManagement(View):
|
|
|
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)
|
|
|
+ return response.json(0)
|
|
|
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:
|
|
|
print(e)
|
|
|
return response.json(500, repr(e))
|
|
|
+
|
|
|
+ @staticmethod
|
|
|
+ def get_app_bundle_id_list(response):
|
|
|
+ try:
|
|
|
+ app_info_qs = App_Info.objects.filter().values('id', 'appBundleId', 'appName')
|
|
|
+ appBundleIdList = list(app_info_qs)
|
|
|
+ return response.json(0, {'list': appBundleIdList})
|
|
|
+ except Exception as e:
|
|
|
+ print(e)
|
|
|
+ return response.json(500, repr(e))
|