|
@@ -188,13 +188,21 @@ class DeviceManagement(View):
|
|
|
# 获取设备类型数据
|
|
|
def getDeviceTypeList(self, request_dict, response):
|
|
|
name = request_dict.get('name', None)
|
|
|
+ pageNo = request_dict.get('pageNo', None)
|
|
|
+ pageSize = request_dict.get('pageSize', None)
|
|
|
+
|
|
|
+ if not all([pageNo, pageSize]):
|
|
|
+ return response.json(444)
|
|
|
|
|
|
+ page = int(pageNo)
|
|
|
+ line = int(pageSize)
|
|
|
try:
|
|
|
if name:
|
|
|
device_type_qs = DeviceTypeModel.objects.filter(name__contains=name).values()
|
|
|
+ total = len(device_type_qs)
|
|
|
else:
|
|
|
- device_type_qs = DeviceTypeModel.objects.filter().values()
|
|
|
-
|
|
|
+ device_type_qs = DeviceTypeModel.objects.filter().values()[(page - 1) * line:page * line]
|
|
|
+ total = DeviceTypeModel.objects.filter().count()
|
|
|
if not device_type_qs.exists():
|
|
|
return response.json(173)
|
|
|
device_type_list = []
|
|
@@ -206,7 +214,7 @@ class DeviceManagement(View):
|
|
|
url = 'device_type/' + icon
|
|
|
device_type['icon'] = bucket.sign_url('GET', url, 3600)
|
|
|
device_type_list.append(device_type)
|
|
|
- return response.json(0, {'list': device_type_list})
|
|
|
+ return response.json(0, {'list': device_type_list, 'total': total})
|
|
|
except Exception as e:
|
|
|
print(e)
|
|
|
return response.json(500, repr(e))
|