河道水情（还需要等待新的河道编码）

src/main/java/com/gunshi/project/hsz/controller/RiverWaterController.java

@@ -37,8 +37,13 @@ public class RiverWaterController {
     private RiverWaterService riverWaterService;
 
     @Get(path = "/get", summary = "河道水情上下游")
-    public R<List<AttRvBaseVo>> list(@RequestParam("stcd") String stcd) {
+    public R<List<AttRvBaseVo>> get(@RequestParam("stcd") String stcd) {
-        return R.ok(riverWaterService.list(stcd));
+        return R.ok(riverWaterService.get(stcd));
+    }
+
+    @Get(path = "/list",summary = "河道水情上下游list(后端固定2个站点编号)")
+    public R<List<AttRvBaseVo>> list() {
+        return R.ok(riverWaterService.list());
     }
 
     @Get(path = "/zqrl", summary = "水位流量关系")

src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java

@@ -271,8 +271,22 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
                     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}
+                    where 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.stcd in ('123','61610700') <!-- 后期需要对这2个站点编码进行修改 -->
+""")
+    List<AttRvBaseVo> queryWaterListUpAndLow();
+
 }

src/main/java/com/gunshi/project/hsz/service/RiverWaterService.java

@@ -48,7 +48,15 @@ public class RiverWaterService {
     @Resource
     private StRiverRRealService stRiverRRealService;
 
-    public List<AttRvBaseVo> list(String stcd) {
+    public List<AttRvBaseVo> list() {
+        List<AttRvBaseVo> attRvBaseVos = attRvBaseMapper.queryWaterListUpAndLow();
+        if(CollectionUtils.isEmpty(attRvBaseVos)){
+            return attRvBaseVos;
+        }
+        return attRvBaseVos;
+    }
+
+    public List<AttRvBaseVo> get(String stcd) {
         List<AttRvBaseVo> attRvBaseVos = attRvBaseMapper.queryWaterListByStcd(stcd);
         if(CollectionUtils.isEmpty(attRvBaseVos)){
             return attRvBaseVos;
@@ -187,7 +195,7 @@ public class RiverWaterService {
         BigDecimal z = stRiverRReal.getZ() == null ? BigDecimal.ZERO : stRiverRReal.getZ();
         vo.setWaterVal(z);
         vo.setWaterAlarmGap(z.subtract(vo.getWaterAlarm()));
-        vo.setWaterPromise(z.subtract(vo.getWaterPromise()));
+        vo.setWaterPromiseGap(z.subtract(vo.getWaterPromise()));
         return vo;
     }
 }