From 65e68706e6e38d5d47b329df54ecb90e031a4f75 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Tue, 24 Sep 2024 15:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E9=81=93=E6=B0=B4=E6=83=85=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=A6=E7=BB=86=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/mapper/AttResBaseMapper.java       | 14 ++++----------
 .../gunshi/project/xyt/mapper/StStbprpBMapper.java |  8 ++++++++
 .../project/xyt/service/RiverWaterService.java     |  2 +-
 .../project/xyt/service/StStbprpBService.java      |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java
index 6f8155b..6dd0e5d 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java
@@ -99,10 +99,10 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
     @Select("""
             <script>
             select
-            <if test="obj.type == 1 ">
+            <if test="type == 1 ">
                t.z from public.st_river_r t
             </if>
-            <if test="obj.type == 2">
+            <if test="type == 2">
                t.rz from public.st_rsvr_r t
             </if>
             where t.stcd = #{stcd} and t.tm = #{dateTime}
@@ -182,17 +182,11 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
 
     @Select("""
             <script>
-            select t.tm,
-            <if test="type == 1">
-               t.z from public.st_river_r_real t
-            </if>
-            <if test="type == 2">
-               t.rz as z from public.st_rsvr_r_real t
-            </if>
+            select t.tm,t.z from public.st_river_r_real t
             where t.stcd = #{stcd}
             order by t.TM desc limit 1
               </script>
                         """)
-    AttRvMonitorVo latestRz(@Param("stcd") String stcd, @Param("type") Integer type);
+    AttRvMonitorVo newRz(@Param("stcd") String stcd);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java
index 217682e..04f9723 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java
@@ -76,4 +76,12 @@ public interface StStbprpBMapper extends BaseMapper<StStbprpB> {
             </script>
             """)
     List<StStatusVo> imgList();
+
+    @Select("""
+            <script>
+            SELECT st.stcd,st.stnm FROM st_stbprp_b st
+            WHERE st.stcd in (select distinct(stcd) from st_stbprp_b_elem where elem ='drp')
+            </script>
+            """)
+    List<StStatusVo> rainList();
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/service/RiverWaterService.java b/src/main/java/com/gunshi/project/xyt/service/RiverWaterService.java
index 4e9f362..7ea713b 100644
--- a/src/main/java/com/gunshi/project/xyt/service/RiverWaterService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/RiverWaterService.java
@@ -120,7 +120,7 @@ public class RiverWaterService {
         BeanUtils.copyProperties(stPptnDetailsVo,vo,AttRvMonitorDetailVo.class);
 
         //最新水位
-        AttRvMonitorVo monitorVo = attRvBaseMapper.latestRz(stcd,2);
+        AttRvMonitorVo monitorVo = attRvBaseMapper.newRz(stcd);
         if(monitorVo == null){
             return vo;
         }
diff --git a/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java b/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java
index ed5d94a..f81a7bd 100644
--- a/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java
@@ -111,7 +111,7 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB>
     }
 
     public List<StStatusVo> rainList() {
-        return this.baseMapper.realRainList();
+        return this.baseMapper.rainList();
     }
 }