From 322ad91129bfa1ffecf12f30639dc0dd17217e1b Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Sat, 11 Oct 2025 17:58:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../hsz/controller/ReservoirWaterController.java | 2 +- .../project/hsz/controller/RiverWaterController.java | 4 ++-- .../com/gunshi/project/hsz/entity/vo/AttRvBaseVo.java | 9 ++++++++- .../gunshi/project/hsz/mapper/AttResBaseMapper.java | 10 ++++++---- .../gunshi/project/hsz/service/StQxWarnRService.java | 4 ++-- .../gunshi/project/hsz/service/StStbprpBService.java | 2 +- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 7f6acc8..baecfa7 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.gunshi flood_algorithm - 1.1 + 1.3.1 org.apache.poi diff --git a/src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java b/src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java index 87874c0..408f493 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java @@ -97,7 +97,7 @@ public class ReservoirWaterController { @Post(path = "/data", summary = "闸阀总览-库容曲线") public R> data(@RequestBody @Validated DataQueryCommonSo dataQueryCommonSo) { - dataQueryCommonSo.setStcd("232");//檀树岗水库 + dataQueryCommonSo.setStcd("232");//黑石咀水库 return R.ok(reservoirWaterService.data(dataQueryCommonSo)); } diff --git a/src/main/java/com/gunshi/project/hsz/controller/RiverWaterController.java b/src/main/java/com/gunshi/project/hsz/controller/RiverWaterController.java index fb2a260..17092a4 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/RiverWaterController.java +++ b/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> monitorData(@RequestBody @Validated DataQueryCommonSo dataQueryCommonSo) { return R.ok(riverWaterService.monitorData(dataQueryCommonSo)); } - @Get(path = "/detail", summary = "监测详细数据（下方表格）") + @Get(path = "/detail", summary = "数据查询-监测详细数据（下方表格）") public R detail(@Schema(name = "stcd") @RequestParam("stcd") String stcd) { return R.ok(riverWaterService.detail(stcd)); } 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 fd5cfbe..f745ad7 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 @@ -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; } 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 abc47b7..b0b5bb2 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java +++ b/src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java @@ -264,7 +264,7 @@ public interface AttResBaseMapper extends BaseMapper { @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 { @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 + 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,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') + left join public.att_res_base arb on 1=1 + where t.stcd in ('123','61610700') """) List queryWaterListUpAndLow(); diff --git a/src/main/java/com/gunshi/project/hsz/service/StQxWarnRService.java b/src/main/java/com/gunshi/project/hsz/service/StQxWarnRService.java index 810e0a7..d4f27fc 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StQxWarnRService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StQxWarnRService.java @@ -126,7 +126,7 @@ public class StQxWarnRService extends ServiceImpl { }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 { }else{ BigDecimal rz = stRiverRReal.getZ(); if(rz == null){ - vo.setOverRvUp("暂无最新水位数据"); + vo.setOverRvUp("无水位数据"); return; } if(rz.compareTo(warnWaterLevel) >=0){ diff --git a/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java b/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java index 9a72ae2..3f1f7e0 100644 --- a/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java +++ b/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java @@ -182,7 +182,7 @@ public class StStbprpBService extends ServiceImpl { 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); }