From 177eea3568b473f15dcaa3bf08034368c2d93b4d Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Wed, 9 Apr 2025 18:03:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B9=B4=E5=BA=A6=E4=BD=8D?=
 =?UTF-8?q?=E7=A7=BB=E5=AF=BC=E5=87=BA=E6=A0=87=E8=AF=AD=E5=88=B0=E7=A9=BA?=
 =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98#604?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyt/mapper/OsmoticPressRMapper.java       |  4 +--
 .../xyt/mapper/OsmoticShiftRMapper.java       |  9 +++---
 .../xyt/service/OsmoticShiftRService.java     | 31 ++++++++++---------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java
index 360fc68..ebeb571 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java
@@ -53,10 +53,10 @@ public interface OsmoticPressRMapper extends BaseMapper<OsmoticPressR> {
             <script>
                 select to_char(t.tm,'YYYY-MM-DD') as tm,t.rz
                 from public.st_rsvr_r t
-                where to_char(t.tm, 'HH24:MI:SS') = '08:00:00' and t.stcd = #{stcd}
+                where t.stcd = #{stcd}
                 <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
                      and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>  
+                </if>
                 <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
                     and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
                 </if>
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticShiftRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticShiftRMapper.java
index 5e83fd6..c89bbe1 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticShiftRMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticShiftRMapper.java
@@ -23,15 +23,14 @@ public interface OsmoticShiftRMapper extends BaseMapper<OsmoticShiftR> {
     @Select("""
             <script>
                 select t.station_code as stationCode,to_char(t.tm,'YYYY-MM-DD') as tm,t.x,t.y,t.h
-                from public.osmotic_shift_r t 
-                where to_char(t.tm, 'HH24:MI:SS') = '08:00:00' 
-                and t.station_code in
+                from public.osmotic_shift_r t
+                where t.station_code in
                 <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
                     #{code}
-                </foreach>	
+                </foreach>
                 <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
                      and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>  
+                </if>
                 <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
                     and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
                 </if>
diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java
index ca8c096..8077ef0 100644
--- a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java
@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 /**
@@ -199,9 +200,9 @@ public class OsmoticShiftRService extends ServiceImpl<OsmoticShiftRMapper, Osmot
         max.put("t1", "最大值");
         for(int i = 0;i < stationCodes.size();i++){
             String code = stationCodes.get(i);
-            max.put(code+X_PREFIX,chartList.stream().filter(o->(code+X_PREFIX).equals(o.getStationCode())).findFirst().get().getMaxValue());
-            max.put(code+Y_PREFIX,chartList.stream().filter(o->(code+Y_PREFIX).equals(o.getStationCode())).findFirst().get().getMaxValue());
-            max.put(code+H_PREFIX,chartList.stream().filter(o->(code+H_PREFIX).equals(o.getStationCode())).findFirst().get().getMaxValue());
+            max.put(code+X_PREFIX,chartList.stream().filter(o->(code+X_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMaxValue());
+            max.put(code+Y_PREFIX,chartList.stream().filter(o->(code+Y_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMaxValue());
+            max.put(code+H_PREFIX,chartList.stream().filter(o->(code+H_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMaxValue());
         }
         list.add(max);
 
@@ -210,9 +211,9 @@ public class OsmoticShiftRService extends ServiceImpl<OsmoticShiftRMapper, Osmot
         maxTm.put("t1", "日期");
         for(int i = 0;i < stationCodes.size();i++){
             String code = stationCodes.get(i);
-            maxTm.put(code+X_PREFIX,chartList.stream().filter(o->(code+X_PREFIX).equals(o.getStationCode())).findFirst().get().getMaxTm());
-            maxTm.put(code+Y_PREFIX,chartList.stream().filter(o->(code+Y_PREFIX).equals(o.getStationCode())).findFirst().get().getMaxTm());
-            maxTm.put(code+H_PREFIX,chartList.stream().filter(o->(code+H_PREFIX).equals(o.getStationCode())).findFirst().get().getMaxTm());
+            maxTm.put(code+X_PREFIX,chartList.stream().filter(o->(code+X_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMaxTm());
+            maxTm.put(code+Y_PREFIX,chartList.stream().filter(o->(code+Y_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMaxTm());
+            maxTm.put(code+H_PREFIX,chartList.stream().filter(o->(code+H_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMaxTm());
         }
         list.add(maxTm);
 
@@ -221,9 +222,9 @@ public class OsmoticShiftRService extends ServiceImpl<OsmoticShiftRMapper, Osmot
         min.put("t1", "最小值");
         for(int i = 0;i < stationCodes.size();i++){
             String code = stationCodes.get(i);
-            min.put(code+X_PREFIX,chartList.stream().filter(o->(code+X_PREFIX).equals(o.getStationCode())).findFirst().get().getMinValue());
-            min.put(code+Y_PREFIX,chartList.stream().filter(o->(code+Y_PREFIX).equals(o.getStationCode())).findFirst().get().getMinValue());
-            min.put(code+H_PREFIX,chartList.stream().filter(o->(code+H_PREFIX).equals(o.getStationCode())).findFirst().get().getMinValue());
+            min.put(code+X_PREFIX,chartList.stream().filter(o->(code+X_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMinValue());
+            min.put(code+Y_PREFIX,chartList.stream().filter(o->(code+Y_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMinValue());
+            min.put(code+H_PREFIX,chartList.stream().filter(o->(code+H_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMinValue());
         }
         list.add(min);
 
@@ -232,9 +233,9 @@ public class OsmoticShiftRService extends ServiceImpl<OsmoticShiftRMapper, Osmot
         minTm.put("t1", "日期");
         for(int i = 0;i < stationCodes.size();i++){
             String code = stationCodes.get(i);
-            minTm.put(code+X_PREFIX,chartList.stream().filter(o->(code+X_PREFIX).equals(o.getStationCode())).findFirst().get().getMinTm());
-            minTm.put(code+Y_PREFIX,chartList.stream().filter(o->(code+Y_PREFIX).equals(o.getStationCode())).findFirst().get().getMinTm());
-            minTm.put(code+H_PREFIX,chartList.stream().filter(o->(code+H_PREFIX).equals(o.getStationCode())).findFirst().get().getMinTm());
+            minTm.put(code+X_PREFIX,chartList.stream().filter(o->(code+X_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMinTm());
+            minTm.put(code+Y_PREFIX,chartList.stream().filter(o->(code+Y_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMinTm());
+            minTm.put(code+H_PREFIX,chartList.stream().filter(o->(code+H_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getMinTm());
         }
         list.add(minTm);
 
@@ -243,9 +244,9 @@ public class OsmoticShiftRService extends ServiceImpl<OsmoticShiftRMapper, Osmot
         diff.put("t1", "年变幅");
         for(int i = 0;i < stationCodes.size();i++){
             String code = stationCodes.get(i);
-            diff.put(code+X_PREFIX,chartList.stream().filter(o->(code+X_PREFIX).equals(o.getStationCode())).findFirst().get().getDiff());
-            diff.put(code+Y_PREFIX,chartList.stream().filter(o->(code+Y_PREFIX).equals(o.getStationCode())).findFirst().get().getDiff());
-            diff.put(code+H_PREFIX,chartList.stream().filter(o->(code+H_PREFIX).equals(o.getStationCode())).findFirst().get().getDiff());
+            diff.put(code+X_PREFIX,chartList.stream().filter(o->(code+X_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getDiff());
+            diff.put(code+Y_PREFIX,chartList.stream().filter(o->(code+Y_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getDiff());
+            diff.put(code+H_PREFIX,chartList.stream().filter(o->(code+H_PREFIX).equals(o.getStationCode())).findFirst().orElseGet(OsmoticChartVo::new).getDiff());
         }
         list.add(diff);