|
@@ -42,7 +42,7 @@ class PcInfo(View):
|
|
return response.json(444, 'operation')
|
|
return response.json(444, 'operation')
|
|
else:
|
|
else:
|
|
|
|
|
|
- if operation == 'query': # pc端查询
|
|
|
|
|
|
+ if operation == 'query': # pc端调用查询
|
|
return self.query(request_dict, response)
|
|
return self.query(request_dict, response)
|
|
elif operation == 'queryall': # 后台查询
|
|
elif operation == 'queryall': # 后台查询
|
|
return self.queryall(request_dict, response)
|
|
return self.queryall(request_dict, response)
|
|
@@ -169,11 +169,18 @@ class PcInfo(View):
|
|
return response.json(500)
|
|
return response.json(500)
|
|
|
|
|
|
def query(self, request_dict, response):
|
|
def query(self, request_dict, response):
|
|
- pc_name = request_dict.get('pc_name', None)
|
|
|
|
- if pc_name is None:
|
|
|
|
|
|
+ package = request_dict.get('package', None)
|
|
|
|
+ file_type = request_dict.get('file_type', None)
|
|
|
|
+ q = Pc_Info.objects.filter(file_type=file_type).filter(package=package)
|
|
|
|
+ print(q)
|
|
|
|
+ if package is None and file_type is None:
|
|
queryset = Pc_Info.objects.all()
|
|
queryset = Pc_Info.objects.all()
|
|
|
|
+ elif package and file_type is None:
|
|
|
|
+ queryset = Pc_Info.objects.filter(package=package)
|
|
|
|
+ elif file_type and package is None:
|
|
|
|
+ queryset = Pc_Info.objects.filter(file_type=file_type)
|
|
else:
|
|
else:
|
|
- queryset = Pc_Info.objects.filter(pc_name=pc_name)
|
|
|
|
|
|
+ queryset = Pc_Info.objects.filter(file_type=file_type).filter(package=package)
|
|
count = queryset.count()
|
|
count = queryset.count()
|
|
res = queryset
|
|
res = queryset
|
|
send_json = CommonService.qs_to_dict(res)
|
|
send_json = CommonService.qs_to_dict(res)
|