diff --git a/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java b/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java index 27fdd28..52d7c80 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java @@ -69,15 +69,15 @@ public class WaterQualityController { } @Operation(summary = "水质监测数据导出") - - - @GetMapping("/export") - public void export(WaterQualityPageSo waterQualityPageSo, HttpServletResponse response) { + @PostMapping("/export") + public void export( + @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody(required = true) + WaterQualityPageSo waterQualityPageSo, HttpServletResponse response) { waterqualityService.export(waterQualityPageSo, response); } @Operation(summary = "水质监测数据导入") - @GetMapping("/import") + @PostMapping("/import") public R importExcel(@RequestParam("file") MultipartFile file) { if (file.isEmpty()) { return R.error(400, "请选择上传文件"); diff --git a/src/main/java/com/gunshi/project/xyt/service/impl/WaterQualityServiceImpl.java b/src/main/java/com/gunshi/project/xyt/service/impl/WaterQualityServiceImpl.java index 58f5267..f59e470 100644 --- a/src/main/java/com/gunshi/project/xyt/service/impl/WaterQualityServiceImpl.java +++ b/src/main/java/com/gunshi/project/xyt/service/impl/WaterQualityServiceImpl.java @@ -52,8 +52,6 @@ public class WaterQualityServiceImpl extends BaseOrderDao page(WaterQualityPageSo pageQueryCriteria) { - requireNonNull(pageQueryCriteria, "pageQueryCriteria should not be null"); - LambdaQueryWrapper query = Wrappers.lambdaQuery(); DateTimeRangeSo timeSo = pageQueryCriteria.getTimeSo();