yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

导入导出接口调整

master
徐杰盟 2024-01-26 09:31:50 +08:00
parent 4dfd5a0cd8
commit e52d85bddc
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java
View File

@ -69,15 +69,15 @@ public class WaterQualityController {
} }
@Operation(summary = "水质监测数据导出") @Operation(summary = "水质监测数据导出")
@PostMapping("/export")
public void export(
@GetMapping("/export") @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody(required = true)
public void export(WaterQualityPageSo waterQualityPageSo, HttpServletResponse response) { WaterQualityPageSo waterQualityPageSo, HttpServletResponse response) {
waterqualityService.export(waterQualityPageSo, response); waterqualityService.export(waterQualityPageSo, response);
} }
@Operation(summary = "水质监测数据导入") @Operation(summary = "水质监测数据导入")
@GetMapping("/import") @PostMapping("/import")
public R<String> importExcel(@RequestParam("file") MultipartFile file) { public R<String> importExcel(@RequestParam("file") MultipartFile file) {
if (file.isEmpty()) { if (file.isEmpty()) {
return R.error(400, "请选择上传文件"); return R.error(400, "请选择上传文件");

2
src/main/java/com/gunshi/project/xyt/service/impl/WaterQualityServiceImpl.java
View File

@ -52,8 +52,6 @@ public class WaterQualityServiceImpl extends BaseOrderDao<WaterQualityMapper, St
@Override @Override
public Page<StWaterQualityR> page(WaterQualityPageSo pageQueryCriteria) { public Page<StWaterQualityR> page(WaterQualityPageSo pageQueryCriteria) {
requireNonNull(pageQueryCriteria, "pageQueryCriteria should not be null");
LambdaQueryWrapper<StWaterQualityR> query = Wrappers.lambdaQuery(); LambdaQueryWrapper<StWaterQualityR> query = Wrappers.lambdaQuery();
DateTimeRangeSo timeSo = pageQueryCriteria.getTimeSo(); DateTimeRangeSo timeSo = pageQueryCriteria.getTimeSo();