修改字段名称

pom.xml

@@ -157,7 +157,7 @@
         <dependency>
             <groupId>org.gunshi</groupId>
             <artifactId>flood_algorithm</artifactId>
-            <version>1.1</version>
+            <version>1.3.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.poi</groupId>

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

@@ -97,7 +97,7 @@ public class ReservoirWaterController {
 
     @Post(path = "/data", summary = "闸阀总览-库容曲线")
     public R<List<AttResMonitorVo>> data(@RequestBody @Validated DataQueryCommonSo dataQueryCommonSo) {
-        dataQueryCommonSo.setStcd("232");//檀树岗水库
+        dataQueryCommonSo.setStcd("232");//黑石咀水库
         return R.ok(reservoirWaterService.data(dataQueryCommonSo));
     }
 

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

@@ -52,12 +52,12 @@ public class RiverWaterController {
     }
 
 
-    @Post(path = "/monitor/data", summary = "监测数据（上方表格）")
+    @Post(path = "/monitor/data", summary = "数据查询-监测数据（上方表格）")
     public R<List<AttRvMonitorVo>> monitorData(@RequestBody @Validated DataQueryCommonSo dataQueryCommonSo) {
         return R.ok(riverWaterService.monitorData(dataQueryCommonSo));
     }
 
-    @Get(path = "/detail", summary = "监测详细数据（下方表格）")
+    @Get(path = "/detail", summary = "数据查询-监测详细数据（下方表格）")
     public R<AttRvMonitorDetailVo> detail(@Schema(name = "stcd") @RequestParam("stcd") String stcd) {
         return R.ok(riverWaterService.detail(stcd));
     }

src/main/java/com/gunshi/project/hsz/entity/vo/AttRvBaseVo.java

@@ -102,7 +102,7 @@ public class AttRvBaseVo {
      * 监测水位
      */
     @Schema(description="监测水位")
-    private BigDecimal z;
+    private BigDecimal rz;
 
     @Schema(description="警戒水位")
     private BigDecimal warnWaterLevel;
@@ -161,4 +161,11 @@ public class AttRvBaseVo {
      */
     @Schema(description="今日雨量")
     private BigDecimal today;
+
+
+    /**
+     * 死水位
+     */
+    @Schema(description = "死水位 写死")
+    private BigDecimal deadLev;
 }

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

@@ -264,7 +264,7 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
 
     @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,
+                    t.lttd as lttd,t.sttp,t.adcd,t.rvnm,t.stlc,t.source,t.esstym,s.tm,s.z as rz,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
@@ -278,14 +278,16 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
 
     @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,
+                    t.lttd as lttd,t.sttp,t.adcd,t.rvnm,t.stlc,t.source,t.esstym,s.tm,s.z as rz,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
+                    srb.warn_water_level as warnWaterLevel,srb.promise_water_level as promiseWaterLevel,sprr.h1,sprr.h3,sprr.h6,sprr.h12,sprr.h24,
+                    sprr.today,arb.dead_lev as deadLev
                     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个站点编码进行修改 -->
+                    left join public.att_res_base arb on 1=1
+                    where t.stcd in ('123','61610700')
 """)
     List<AttRvBaseVo> queryWaterListUpAndLow();
 

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

@@ -126,7 +126,7 @@ public class StQxWarnRService extends ServiceImpl<StQxWarnRMapper, StQxWarnR> {
             }else{
                 BigDecimal rz = stRiverRReal.getZ();
                 if(rz == null){
-                    vo.setOverRvUp("暂无最新水位数据");
+                    vo.setOverRvUp("无水位数据");
                     return;
                 }
                 if(rz.compareTo(warnWaterLevel) >=0){
@@ -156,7 +156,7 @@ public class StQxWarnRService extends ServiceImpl<StQxWarnRMapper, StQxWarnR> {
             }else{
                 BigDecimal rz = stRiverRReal.getZ();
                 if(rz == null){
-                    vo.setOverRvUp("暂无最新水位数据");
+                    vo.setOverRvUp("无水位数据");
                     return;
                 }
                 if(rz.compareTo(warnWaterLevel) >=0){

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

@@ -182,7 +182,7 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB> {
                 Instant curInstant = vo.getTm().toInstant();
                 Instant preInstant = voPrev.getTm().toInstant();
                 long timeDiffSeconds = Duration.between(curInstant, preInstant).getSeconds();
-
+                //TODO 或者改成60 * 60 .multiply(BigDecimal.valueOf(60 * 60))
                 BigDecimal qTotal = voPrev.getQtotal().add(vo.getFlowNum().multiply(BigDecimal.valueOf(timeDiffSeconds)));
                 vo.setQtotal(qTotal);
             }