|
@@ -30,9 +30,16 @@ public class PortWarningInfoController {
|
|
|
|
|
|
@PostMapping("/page")
|
|
@PostMapping("/page")
|
|
public Result page(@RequestBody WarningPageParam warningPageParam){
|
|
public Result page(@RequestBody WarningPageParam warningPageParam){
|
|
|
|
+ String startTime = warningPageParam.getStartTime();
|
|
|
|
+ String endTime = warningPageParam.getEndTime();
|
|
|
|
+ if (ObjectUtil.isNotEmpty(startTime)){
|
|
|
|
+ startTime = startTime + " 00:00:00";
|
|
|
|
+ endTime = endTime + " 23:59:59";
|
|
|
|
+ }
|
|
Page<PortWarningInfo> page = new Page<>(warningPageParam.getPageNum(),warningPageParam.getPageSize());
|
|
Page<PortWarningInfo> page = new Page<>(warningPageParam.getPageNum(),warningPageParam.getPageSize());
|
|
Page<PortWarningInfo> warningInfoPage = portWarningInfoService.page(page, new QueryWrapper<PortWarningInfo>().lambda()
|
|
Page<PortWarningInfo> warningInfoPage = portWarningInfoService.page(page, new QueryWrapper<PortWarningInfo>().lambda()
|
|
- .eq(ObjectUtil.isNotEmpty(warningPageParam.getWarningType()), PortWarningInfo::getWarningType, warningPageParam.getWarningType()));
|
|
|
|
|
|
+ .eq(ObjectUtil.isNotEmpty(warningPageParam.getWarningType()), PortWarningInfo::getWarningType, warningPageParam.getWarningType())
|
|
|
|
+ .between(ObjectUtil.isNotEmpty(startTime),PortWarningInfo::getCreateTime,startTime,endTime));
|
|
return new Result(ResultCode.SUCCESS,warningInfoPage);
|
|
return new Result(ResultCode.SUCCESS,warningInfoPage);
|
|
}
|
|
}
|
|
|
|
|