导入导出接口调整
parent
4dfd5a0cd8
commit
e52d85bddc
|
|
@ -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<String> importExcel(@RequestParam("file") MultipartFile file) {
|
||||
if (file.isEmpty()) {
|
||||
return R.error(400, "请选择上传文件");
|
||||
|
|
|
|||
|
|
@ -52,8 +52,6 @@ public class WaterQualityServiceImpl extends BaseOrderDao<WaterQualityMapper, St
|
|||
@Override
|
||||
public Page<StWaterQualityR> page(WaterQualityPageSo pageQueryCriteria) {
|
||||
|
||||
requireNonNull(pageQueryCriteria, "pageQueryCriteria should not be null");
|
||||
|
||||
LambdaQueryWrapper<StWaterQualityR> query = Wrappers.lambdaQuery();
|
||||
|
||||
DateTimeRangeSo timeSo = pageQueryCriteria.getTimeSo();
|
||||
|
|
|
|||
Loading…
Reference in New Issue