|
@@ -91,23 +91,26 @@ public class PersonDeviceFilterLogController {
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParam(name="token",value = "令牌",required = true,paramType = "form"),
|
|
@ApiImplicitParam(name="token",value = "令牌",required = true,paramType = "form"),
|
|
@ApiImplicitParam(name="subject",value = "目标(不传)",paramType = "form"),
|
|
@ApiImplicitParam(name="subject",value = "目标(不传)",paramType = "form"),
|
|
|
|
+ @ApiImplicitParam(name="fever",value = "是否异常",required = false,paramType = "form",dataType = "Boolean")
|
|
// @ApiImplicitParam(name = "recordDate",value = "查询日期(yyyy-MM-dd)", required = false, paramType = "form",dataType = "String")
|
|
// @ApiImplicitParam(name = "recordDate",value = "查询日期(yyyy-MM-dd)", required = false, paramType = "form",dataType = "String")
|
|
})
|
|
})
|
|
public MessageResult<Map> pageList(//@RequestParam(value="recordDate",defaultValue="") String recordDate,
|
|
public MessageResult<Map> pageList(//@RequestParam(value="recordDate",defaultValue="") String recordDate,
|
|
- @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
|
|
|
|
- @RequestParam(value="pageSize",defaultValue="20") int pageSize,
|
|
|
|
- @RequestAttribute String subject,
|
|
|
|
- String token){
|
|
|
|
|
|
+ @RequestParam(value="fever",defaultValue="") Boolean fever,
|
|
|
|
+ @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
|
|
|
|
+ @RequestParam(value="pageSize",defaultValue="20") int pageSize,
|
|
|
|
+ @RequestAttribute String subject,
|
|
|
|
+ String token){
|
|
MessageResult<Map> msgResult = new MessageResult<>();
|
|
MessageResult<Map> msgResult = new MessageResult<>();
|
|
|
|
|
|
try {
|
|
try {
|
|
- List<PersonDeviceFilterLogDTO> listPersonDeviceFilterLogDTO = new ArrayList<>();
|
|
|
|
-
|
|
|
|
- Map<String,Object> searchParams = new HashMap<>();
|
|
|
|
- searchParams.put("personId",subject);
|
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
List<Sort> sortList = new ArrayList<>();
|
|
sortList.add(new Sort("a.id_","asc"));
|
|
sortList.add(new Sort("a.id_","asc"));
|
|
|
|
|
|
|
|
+ Map<String,Object> searchParams = new HashMap<>();
|
|
|
|
+ searchParams.put("personId",subject);
|
|
|
|
+ if(fever != null){
|
|
|
|
+ searchParams.put("fever", fever);
|
|
|
|
+ }
|
|
// if(StringUtils.isNotEmpty(recordDate)) {
|
|
// if(StringUtils.isNotEmpty(recordDate)) {
|
|
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
// Calendar calendar = Calendar.getInstance();
|
|
// Calendar calendar = Calendar.getInstance();
|
|
@@ -138,8 +141,6 @@ public class PersonDeviceFilterLogController {
|
|
}else {
|
|
}else {
|
|
personDeviceFilterLogDTO.setFever(false);
|
|
personDeviceFilterLogDTO.setFever(false);
|
|
}
|
|
}
|
|
-
|
|
|
|
- listPersonDeviceFilterLogDTO.add(personDeviceFilterLogDTO);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
msgResult.setResult(true);
|
|
msgResult.setResult(true);
|