|
@@ -139,14 +139,31 @@ class UidSetView(View):
|
|
|
line = request_dict.get('line', None)
|
|
|
page = int(page)
|
|
|
line = int(line)
|
|
|
- omqs = UidSetModel.objects.all().order_by('-id')
|
|
|
- if not omqs.exists():
|
|
|
- return response.json(0, [])
|
|
|
- count = omqs.count()
|
|
|
- order_ql = omqs[(page - 1) * line:page * line]
|
|
|
- uidset_json = CommonService.qs_to_dict(order_ql)
|
|
|
- uidset_json['count'] = count
|
|
|
- return response.json(0, uidset_json)
|
|
|
+ deviceContent = request_dict.get('content', None)
|
|
|
+ if deviceContent:
|
|
|
+ try:
|
|
|
+ searchCondition = json.loads(deviceContent)
|
|
|
+ except Exception as e:
|
|
|
+ return response.json(10, repr(e))
|
|
|
+ else:
|
|
|
+ kwargs = CommonService.get_kwargs(data=searchCondition)
|
|
|
+ omqs = UidSetModel.objects.filter(**kwargs)
|
|
|
+ if not omqs.exists():
|
|
|
+ return response.json(0, [])
|
|
|
+ count = omqs.count()
|
|
|
+ order_ql = omqs[(page - 1) * line:page * line]
|
|
|
+ uidset_json = CommonService.qs_to_dict(order_ql)
|
|
|
+ uidset_json['count'] = count
|
|
|
+ return response.json(0, uidset_json)
|
|
|
+ else:
|
|
|
+ omqs = UidSetModel.objects.all().order_by('-id')
|
|
|
+ if not omqs.exists():
|
|
|
+ return response.json(0, [])
|
|
|
+ count = omqs.count()
|
|
|
+ order_ql = omqs[(page - 1) * line:page * line]
|
|
|
+ uidset_json = CommonService.qs_to_dict(order_ql)
|
|
|
+ uidset_json['count'] = count
|
|
|
+ return response.json(0, uidset_json)
|
|
|
else:
|
|
|
return response.json(404)
|
|
|
|