河道水情监测详细数据修改

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,
+            select t.tm,t.z from public.st_river_r_real t
-            <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>
             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);
 
 }

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();
 }

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;
         }

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();
     }
 }