|
@@ -898,9 +898,11 @@ class UnicomManageControllerView(View):
|
|
if is_down:
|
|
if is_down:
|
|
code_qs = code_qs.filter(is_down=int(is_down))
|
|
code_qs = code_qs.filter(is_down=int(is_down))
|
|
code_list = []
|
|
code_list = []
|
|
|
|
+ total = code_qs.count()
|
|
|
|
+ result = {'total': total, 'data': code_list}
|
|
code_qs = code_qs.order_by('-created_time')[(page - 1) * line:page * line]
|
|
code_qs = code_qs.order_by('-created_time')[(page - 1) * line:page * line]
|
|
if not code_qs.exists():
|
|
if not code_qs.exists():
|
|
- return response.json(0, code_list)
|
|
|
|
|
|
+ return response.json(0, result)
|
|
for item in code_qs:
|
|
for item in code_qs:
|
|
combo_name = UnicomCombo.objects.filter(id=item.package_id)[0].combo_name
|
|
combo_name = UnicomCombo.objects.filter(id=item.package_id)[0].combo_name
|
|
code_list.append({
|
|
code_list.append({
|
|
@@ -914,8 +916,8 @@ class UnicomManageControllerView(View):
|
|
'createdTime': item.created_time,
|
|
'createdTime': item.created_time,
|
|
'updatedTime': item.updated_time
|
|
'updatedTime': item.updated_time
|
|
})
|
|
})
|
|
-
|
|
|
|
- return response.json(0, code_list)
|
|
|
|
|
|
+ result['data'] = code_list
|
|
|
|
+ return response.json(0, result)
|
|
except Exception as e:
|
|
except Exception as e:
|
|
LOGGER.info('异常详情,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
LOGGER.info('异常详情,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
return response.json(500)
|
|
return response.json(500)
|