From 0a6cc7d11c134125d2f92e1f52d811701caaa99c Mon Sep 17 00:00:00 2001 From: lyf66 Date: Mon, 7 Apr 2025 11:49:39 +0800 Subject: [PATCH] . --- ruoyi | 2 +- .../project/xyt/mapper/AttResBaseMapper.java | 4 +- .../project/xyt/mapper/StStbprpBMapper.java | 49 +++++++++++++------ .../xyt/service/ReservoirWaterService.java | 2 - .../project/xyt/service/StStbprpBService.java | 9 ++++ .../project/xyt/timetask/DataTaskTSG.java | 2 +- .../project/xyt/timetask/PaDataTask.java | 2 +- src/main/resources/application.yml | 8 --- src/main/resources/config-common.yml | 11 +---- src/main/resources/config-dev.yml | 12 +++++ src/main/resources/config-prod.yml | 14 ++++++ 11 files changed, 74 insertions(+), 41 deletions(-) delete mode 100644 src/main/resources/application.yml diff --git a/ruoyi b/ruoyi index ed71040..a366de5 160000 --- a/ruoyi +++ b/ruoyi @@ -1 +1 @@ -Subproject commit ed710408bffa365228193ae257e70bfcb33469dd +Subproject commit a366de5efba39e059d94a7d7d3468cc0536b3a51 diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java index fcc9305..8e03111 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/AttResBaseMapper.java @@ -52,11 +52,11 @@ public interface AttResBaseMapper extends BaseMapper { case when s.des_flood_lev is not null and m.rz-s.des_flood_lev > 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 > 0 then 1 else 0 end as flState from public.st_stbprp_b t - left join public.att_res_base s on t.stcd = s.stcd + left join public.att_res_base s on 1=1 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 - where t.sttp = 'RR' and s.res_code in('42120250085','42120250086') + where t.sttp = 'RR' order by aFsltdz desc nulls last """) diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java index b029976..db564d9 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java @@ -87,21 +87,38 @@ public interface StStbprpBMapper extends BaseMapper { """) List rainList(); - @Select("") +// @Select("") + @Select(""" + + """) List flowList(@Param("obj") StZqrlBDto obj); } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java index e0917c4..995ef42 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java @@ -138,8 +138,6 @@ public class ReservoirWaterService { public List zvarl(String stcd) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.eq(StZvarlB::getStcd, stcd) - .orderByAsc(StZvarlB::getPtno); return stZvarlBMapper.selectList(queryWrapper); } diff --git a/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java b/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java index ff68215..85eb138 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java @@ -46,6 +46,8 @@ public class StStbprpBService extends ServiceImpl @Autowired private StZqrlBService stZqrlBService; + @Autowired + private StRsvrRService rsvrRService; public List rainfallStationDetailsList(HomeStStbprpBSo dto) { return baseMapper.rainfallStationDetailsList(dto); @@ -125,7 +127,14 @@ public class StStbprpBService extends ServiceImpl } public List flowList(StZqrlBDto obj){ + /* + * 查出时段内的水位列表，按时间升序排，根据水位查水位流量曲线表得到流量 + * 第一条数据的累计溢洪量设为0，第二条累计溢洪量=上一条累计溢洪量+本条溢洪流量*60分*60秒，以此类推 + */ +// rsvrRService. List stZqrlBVos = baseMapper.flowList(obj); + List zqrlList = stZqrlBService.list(); + BigDecimal runningSum = BigDecimal.ZERO; for (StZqrlBVo current : stZqrlBVos) { diff --git a/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java b/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java index 4c7aa6c..45c0b46 100644 --- a/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java +++ b/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java @@ -57,7 +57,7 @@ import java.util.stream.Collectors; @EnableScheduling//开启定时任务 @Component @Slf4j -@Profile("prod") +//@Profile("prod") public class DataTaskTSG { private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/src/main/java/com/gunshi/project/xyt/timetask/PaDataTask.java b/src/main/java/com/gunshi/project/xyt/timetask/PaDataTask.java index 389b089..279f883 100644 --- a/src/main/java/com/gunshi/project/xyt/timetask/PaDataTask.java +++ b/src/main/java/com/gunshi/project/xyt/timetask/PaDataTask.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; @EnableScheduling//开启定时任务 @Component @Slf4j -@Profile("prod") +//@Profile("prod") public class PaDataTask { private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml deleted file mode 100644 index 51fd092..0000000 --- a/src/main/resources/application.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: - - config-common.yml - - config-dev.yml - - config-ruoyi.yml -#mybatis-plus: -# mapperLocations: classpath*:mapper/**/*.xml diff --git a/src/main/resources/config-common.yml b/src/main/resources/config-common.yml index c7294e4..cd243dd 100644 --- a/src/main/resources/config-common.yml +++ b/src/main/resources/config-common.yml @@ -23,21 +23,12 @@ spring: gunshi: core: appName: project-xyt - file: - key: 6gaWRs4bz4mxpXXxgZF4 - secret: 3QFbff974hVwpH6laAondq33iShpzs6YG4XsrTRT - endpoint: http://10.42.6.75:9100 - publicBucket: gs-tsg - loginBucket: gs-tsg - privateBucket: gs-tsg shqxjsCloudowrCnPath: http://shqxjs.cloudowr.cn/service/ owrsvrPath: http://owrsvr.cloudowr.cn/ -#jcskPath: http://223.75.53.124:8002/shareddata/api/v1/monitdata -jcskPath: http://64.97.142.113:8002/shareddata/api/v1/monitdata -jcskToken: FB1EE57468E0CB9A51306F9056A534778235BF27CBDCB8546B7EABA6FB72BBCBEE4BB01A9CBD8C3899E682C67167C02D81FDABD21639DE2655EB4EE567391899 + reloadCache: http://223.75.53.124:8002/shareddata/sys/whitelists/reloadCache diff --git a/src/main/resources/config-dev.yml b/src/main/resources/config-dev.yml index 78872c4..bf2479e 100644 --- a/src/main/resources/config-dev.yml +++ b/src/main/resources/config-dev.yml @@ -24,6 +24,15 @@ mybatis-plus: configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +gunshi: + file: + key: 6gaWRs4bz4mxpXXxgZF4 + secret: 3QFbff974hVwpH6laAondq33iShpzs6YG4XsrTRT + endpoint: http://223.75.53.141:9100 + publicBucket: gs-tsg + loginBucket: gs-tsg + privateBucket: gs-tsg + # 洪水预测数据库连接信息 algorithem: datasource: @@ -31,3 +40,6 @@ algorithem: username: gunshiiot password: 1234567a driver-class-name: org.postgresql.Driver + +jcskPath: http://223.75.53.124:8002/shareddata/api/v1/monitdata +jcskToken: FB1EE57468E0CB9A51306F9056A534778235BF27CBDCB8546B7EABA6FB72BBCBEE4BB01A9CBD8C3899E682C67167C02D81FDABD21639DE2655EB4EE567391899 \ No newline at end of file diff --git a/src/main/resources/config-prod.yml b/src/main/resources/config-prod.yml index 6b6538b..12c67e2 100644 --- a/src/main/resources/config-prod.yml +++ b/src/main/resources/config-prod.yml @@ -24,6 +24,17 @@ mybatis-plus: configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +gunshi: + core: + appName: project-xyt + file: + key: 6gaWRs4bz4mxpXXxgZF4 + secret: 3QFbff974hVwpH6laAondq33iShpzs6YG4XsrTRT + endpoint: http://10.42.6.75:9100 + publicBucket: gs-tsg + loginBucket: gs-tsg + privateBucket: gs-tsg + # 洪水预测数据库连接信息 algorithem: datasource: @@ -31,3 +42,6 @@ algorithem: username: gunshiiot password: 1234567a driver-class-name: org.postgresql.Driver + +jcskPath: http://64.97.142.113:8002/shareddata/api/v1/monitdata +jcskToken: FB1EE57468E0CB9A51306F9056A534778235BF27CBDCB8546B7EABA6FB72BBCBEE4BB01A9CBD8C3899E682C67167C02D81FDABD21639DE2655EB4EE567391899 \ No newline at end of file