diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/AttRvBaseVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/AttRvBaseVo.java
index b1ade0a..fd5cfbe 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/AttRvBaseVo.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/vo/AttRvBaseVo.java
@@ -105,10 +105,10 @@ public class AttRvBaseVo {
     private BigDecimal z;
 
     @Schema(description="警戒水位")
-    private BigDecimal wrz;
+    private BigDecimal warnWaterLevel;
 
-    @Schema(description="危险水位")
-    private BigDecimal grz;
+    @Schema(description="保证水位")
+    private BigDecimal promiseWaterLevel;
 
     /**
      * 图片路径
@@ -116,7 +116,7 @@ public class AttRvBaseVo {
     @Schema(description = "图片路径")
     private String imgPath;
 
-    @Schema(description="是否超危险水位（0否 1是）")
+    @Schema(description="是否超保证水位（0否 1是）")
     private Integer gstate;
 
     @Schema(description="是否超警戒水位（0否 1是）")
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java
index 51ffb06..f45ccb2 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java
@@ -49,7 +49,7 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
             case when s.des_flood_lev is not null and m.rz-s.des_flood_lev &gt; 0 then 1 else 0 end as desState,
             case when s.fl_low_lim_lev is not null and m.rz-s.fl_low_lim_lev &gt; 0 then 1 else 0 end as flState
             from public.st_stbprp_b t
-            left join public.att_res_base s on 1=1
+            join public.att_res_base s on t.stcd = s.stcd
             left join public.st_addvcd_d sad on t.adcd = sad.adcd
             left join public.st_rsvr_r_real m on t.stcd = m.stcd
             left join public.st_pptn_r_real sprr on t.stcd = sprr.stcd
@@ -177,11 +177,12 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
             <script>
             select t.stcd,t.stnm,t.lgtd as lgtd,
             t.lttd as lttd,t.sttp,t.adcd,t.rvnm,t.stlc,t.source,t.esstym,s.tm,s.z,s.q,sad.adnm,
-            srb.wrz,srb.grz,srb.invrz,srb.invrztm
+            srb.warn_water_level as warnWaterLevel,srb.promise_water_level as promiseWaterLevel,sprr.h1,sprr.h3,sprr.h6,sprr.h12,sprr.h24,sprr.today
             from public.st_stbprp_b t
             left join public.st_river_r_real s on t.stcd = s.stcd
             left join public.st_addvcd_d sad on t.adcd = sad.adcd
-            left join public.st_rvfcch_b srb on t.stcd = srb.stcd
+            left join public.alarm_set srb on t.stcd = srb.stcd
+            left join public.st_pptn_r_real sprr on t.stcd = sprr.stcd
             where t.sttp = 'ZZ'
               </script>
                         """)
@@ -246,4 +247,32 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
             order by date desc
             """)
     List<ResBriefVo> getBriefList(String startDate, String endDate);
+
+
+//    @Select("""
+//                    select t.stcd,t.stnm,t.lgtd as lgtd,
+//                    t.lttd as lttd,t.sttp,t.adcd,t.rvnm,t.stlc,t.source,t.esstym,s.tm,s.z,s.q,sad.adnm,
+//                    srb.wrz,srb.grz,srb.invrz,srb.invrztm,sprr.h1,sprr.h3,sprr.h6,sprr.h12,sprr.h24,sprr.today
+//                    from public.st_stbprp_b t
+//                    left join public.st_river_r_real s on t.stcd = s.stcd
+//                    left join public.st_addvcd_d sad on t.adcd = sad.adcd
+//                    left join public.st_rvfcch_b srb on t.stcd = srb.stcd
+//                    left join public.st_pptn_r_real sprr on t.stcd = sprr.stcd
+//                    where t.sttp = 'ZZ' and t.stcd = #{stcd}
+//""")
+//    List<AttRvBaseVo> queryWaterListByStcd(@Param("stcd") String stcd);
+
+    @Select("""
+                    select t.stcd,t.stnm,t.lgtd as lgtd,
+                    t.lttd as lttd,t.sttp,t.adcd,t.rvnm,t.stlc,t.source,t.esstym,s.tm,s.z,s.q,sad.adnm,
+                    srb.warn_water_level as warnWaterLevel,srb.promise_water_level as promiseWaterLevel,sprr.h1,sprr.h3,sprr.h6,sprr.h12,sprr.h24,sprr.today
+                    from public.st_stbprp_b t
+                    left join public.st_river_r_real s on t.stcd = s.stcd
+                    left join public.st_addvcd_d sad on t.adcd = sad.adcd
+                    left join public.alarm_set srb on t.stcd = srb.stcd
+                    left join public.st_pptn_r_real sprr on t.stcd = sprr.stcd
+                    where t.sttp = 'ZZ' and t.stcd = #{stcd}
+""")
+    List<AttRvBaseVo> queryWaterListByStcd(@Param("stcd") String stcd);
+
 }
\ No newline at end of file