From 8c3b5c6a2d04395e248515a063921ef7984b70b3 Mon Sep 17 00:00:00 2001
From: dwj <dwj19@126.com>
Date: Thu, 25 Jan 2024 19:29:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gunshi/project/xyt/Main.java     |  1 +
 .../project/xyt/service/SysDictService.java   |  3 ++-
 .../service/impl/WaterQualityServiceImpl.java | 14 +++++-----
 .../project/xyt/so/WaterQualityPageSo.java    | 26 +++++++++----------
 src/main/resources/logback.xml                |  2 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/Main.java b/src/main/java/com/gunshi/project/xyt/Main.java
index 2b971ed..9894b35 100644
--- a/src/main/java/com/gunshi/project/xyt/Main.java
+++ b/src/main/java/com/gunshi/project/xyt/Main.java
@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.servers.Server;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 /**
  * 类描述
diff --git a/src/main/java/com/gunshi/project/xyt/service/SysDictService.java b/src/main/java/com/gunshi/project/xyt/service/SysDictService.java
index 2b74f02..f0077a9 100644
--- a/src/main/java/com/gunshi/project/xyt/service/SysDictService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/SysDictService.java
@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author Sun Lejun
@@ -55,7 +56,7 @@ public class SysDictService extends BaseOrderDao<SysDictBMapper, SysDictB> {
         }
         //拿出查询出来的PID和ID，获取完整的记录
         List<SysDictB> records = sysDictVoPage.getRecords();
-        List<Long> list = records.stream().map(SysDictB::getId).toList();
+        List<Long> list = records.stream().map(SysDictB::getId).collect(Collectors.toList());
         List<SysDictVo> sysDictVos = this.getBaseMapper().queryByPidOrIds(list);
         //转换成tree
         List<SysDictVo> tree = TreeUtil.list2ListTree(sysDictVos, 0L, SysDictVo::getId, SysDictVo::getPid, SysDictVo::setChildren, null);
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 466ab9d..3df7786 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
@@ -50,14 +50,14 @@ public class WaterQualityServiceImpl extends BaseOrderDao<WaterQualityMapper, St
         LambdaQueryWrapper<StWaterQualityR> query = Wrappers.lambdaQuery();
 
 
-        if (so.getStm() != null) {
-            query.ge(StWaterQualityR::getSpt, so.getStm());
+        if (so.getTimeSo() != null&& so.getTimeSo().hasStart()) {
+            query.ge(StWaterQualityR::getSpt, so.getTimeSo().getStart());
         }
-        if (so.getEtm() != null) {
-            query.le(StWaterQualityR::getSpt, so.getEtm());
+        if (so.getTimeSo() != null&& so.getTimeSo().hasEnd()) {
+            query.le(StWaterQualityR::getSpt,so.getTimeSo().getEnd());
         }
 
-        return super.page(so.toPage(), query);
+        return super.page(so.getPageSo().toPage(), query);
     }
 
     /**
@@ -73,9 +73,9 @@ public class WaterQualityServiceImpl extends BaseOrderDao<WaterQualityMapper, St
 
         // 生成文件名
         String fileName = "水质统计表 "
-                + DateFormatUtils.format(so.getStm(), DateFormatString.YYYY_MM_DD_HH_MM_SS)
+                + DateFormatUtils.format(so.getTimeSo().getStart(), DateFormatString.YYYY_MM_DD_HH_MM_SS)
                 + "至"
-                + DateFormatUtils.format(so.getEtm(), DateFormatString.YYYY_MM_DD_HH_MM_SS)
+                + DateFormatUtils.format(so.getTimeSo().getEnd(), DateFormatString.YYYY_MM_DD_HH_MM_SS)
                 + ".xlsx";
 
 //        String tempPath = System.getProperty("java.io.tmpdir") + IdUtil.fastSimpleUUID() + ".xlsx";
diff --git a/src/main/java/com/gunshi/project/xyt/so/WaterQualityPageSo.java b/src/main/java/com/gunshi/project/xyt/so/WaterQualityPageSo.java
index 10d1a76..c8bc163 100644
--- a/src/main/java/com/gunshi/project/xyt/so/WaterQualityPageSo.java
+++ b/src/main/java/com/gunshi/project/xyt/so/WaterQualityPageSo.java
@@ -2,8 +2,12 @@ package com.gunshi.project.xyt.so;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gunshi.core.dateformat.DateFormatString;
+import com.gunshi.db.dto.DateTimeRangeSo;
 import com.gunshi.db.dto.PageSo;
+import com.gunshi.project.xyt.validate.markers.QueryPage;
+import com.gunshi.project.xyt.validate.markers.QueryTimeRange;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -17,20 +21,14 @@ import java.util.Date;
  * @author XuSan
  * @version 1.0
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class WaterQualityPageSo extends PageSo {
-
-    @Schema(description = "查询开始时间", pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS,
-            example = DateFormatString.YYYY_MM_DD_HH_MM_SS_EXAMPLE)
-    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
-    @DateTimeFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS)
-    private Date stm;
-
-    @Schema(description = "查询结束时间", pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS,
-            example = DateFormatString.YYYY_MM_DD_HH_MM_SS_EXAMPLE)
-    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
-    @DateTimeFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS)
-    private Date etm;
+public class WaterQualityPageSo {
 
+    @Schema(description = "分页参数")
+    @NotNull(message = "分页参数不能为空", groups = {QueryPage.class})
+    private PageSo pageSo;
+    
+    @Schema(description = "时间范围")
+    @NotNull(message = "时间范围不能为空")
+    private DateTimeRangeSo timeSo;
 }
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 8e23219..69ad31d 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -74,7 +74,7 @@
 <!--&lt;!&ndash;        </rollingPolicy>&ndash;&gt;-->
 <!--    </appender>-->
 
-    <root level="INFO">
+    <root level="DEBUG">
         <appender-ref ref="STDOUT"/>
 <!--        <appender-ref ref="ERROR-MONGO" />-->
     </root>