分页查询修改

src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java

@@ -69,6 +69,8 @@ public class WaterQualityController {
     }
 
     @Operation(summary = "水质监测数据导出")
+
+    
     @GetMapping("/export")
     public void export(WaterQualityPageSo waterQualityPageSo, HttpServletResponse response) {
         waterqualityService.export(waterQualityPageSo, response);

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.dateformat.DateFormatString;
 import com.gunshi.db.dao.BaseOrderDao;
+import com.gunshi.db.dto.DateTimeRangeSo;
 import com.gunshi.project.xyt.mapper.WaterQualityMapper;
 import com.gunshi.project.xyt.model.StWaterQualityR;
 import com.gunshi.project.xyt.service.WaterQualityService;
@@ -21,11 +22,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * Description:
  * Created by xusan on 2023/1/23.
@@ -43,21 +47,28 @@ public class WaterQualityServiceImpl extends BaseOrderDao<WaterQualityMapper, St
     /**
      * 水质列表分页查询
      *
-     * @param so 水质列表分页查询
+     * @param pageQueryCriteria 查询参数
      */
     @Override
-    public Page<StWaterQualityR> page(WaterQualityPageSo so) {
+    public Page<StWaterQualityR> page(WaterQualityPageSo pageQueryCriteria) {
+
+        requireNonNull(pageQueryCriteria, "pageQueryCriteria should not be null");
+
         LambdaQueryWrapper<StWaterQualityR> query = Wrappers.lambdaQuery();
 
+        DateTimeRangeSo timeSo = pageQueryCriteria.getTimeSo();
 
-        if (so.getTimeSo() != null&& so.getTimeSo().hasStart()) {
+        if (timeSo != null) {
-            query.ge(StWaterQualityR::getSpt, so.getTimeSo().getStart());
+            if (timeSo.getStart() != null) {
-        }
+                query.ge(StWaterQualityR::getSpt, timeSo.getStart());
-        if (so.getTimeSo() != null&& so.getTimeSo().hasEnd()) {
+            }
-            query.le(StWaterQualityR::getSpt,so.getTimeSo().getEnd());
+            if (timeSo.getEnd() != null) {
+                query.le(StWaterQualityR::getSpt, timeSo.getEnd());
+            }
         }
 
-        return super.page(so.getPageSo().toPage(), query);
+
+        return super.page(pageQueryCriteria.getPageSo().toPage(), query);
     }
 
     /**
@@ -75,7 +86,7 @@ public class WaterQualityServiceImpl extends BaseOrderDao<WaterQualityMapper, St
         String fileName = "水质统计表 "
                 + DateFormatUtils.format(so.getTimeSo().getStart(), DateFormatString.YYYY_MM_DD_HH_MM_SS)
                 + "至"
-                + DateFormatUtils.format(so.getTimeSo().getEnd(), DateFormatString.YYYY_MM_DD_HH_MM_SS)
+                + DateFormatUtils.format(so.getTimeSo().getStart(), DateFormatString.YYYY_MM_DD_HH_MM_SS)
                 + ".xlsx";
 
 //        String tempPath = System.getProperty("java.io.tmpdir") + IdUtil.fastSimpleUUID() + ".xlsx";
@@ -102,8 +113,8 @@ public class WaterQualityServiceImpl extends BaseOrderDao<WaterQualityMapper, St
         response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8));
 
         // 数据输出
-        try {
+        try (OutputStream outputStream = response.getOutputStream()){
-            EasyExcel.write(response.getOutputStream(), StWaterQualityR.class).sheet("水质").doWrite(page.getRecords());
+            EasyExcel.write(outputStream, StWaterQualityR.class).sheet("水质").doWrite(page.getRecords());
         } catch (IOException e) {
             log.error("水质文件下载失败, " + e.getMessage(),e);
             throw new RuntimeException(e);