master
parent
22589c196f
commit
0a6cc7d11c
2
ruoyi
2
ruoyi
|
|
@ -1 +1 @@
|
|||
Subproject commit ed710408bffa365228193ae257e70bfcb33469dd
|
||||
Subproject commit a366de5efba39e059d94a7d7d3468cc0536b3a51
|
||||
|
|
@ -52,11 +52,11 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
|
|||
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
|
||||
</script>
|
||||
""")
|
||||
|
|
|
|||
|
|
@ -87,21 +87,38 @@ public interface StStbprpBMapper extends BaseMapper<StStbprpB> {
|
|||
""")
|
||||
List<StStatusVo> rainList();
|
||||
|
||||
@Select("<script>" +
|
||||
"SELECT a.stcd AS stcd, a.moditime AS tm, a.z AS waterLevel, " +
|
||||
"a.q AS flowNum, b.w AS boxNum " +
|
||||
"FROM st_zqrl_b a " +
|
||||
"LEFT JOIN st_zvarl_b b ON a.z = b.rz " +
|
||||
"WHERE 1=1 " +
|
||||
"<if test='obj.stcd != null'> " +
|
||||
"AND a.stcd = #{obj.stcd} " +
|
||||
"</if> " +
|
||||
"<if test='obj.dateSo != null and obj.dateSo.start != null'> " +
|
||||
" AND a.moditime >= #{obj.dateSo.start} " +
|
||||
"</if> " +
|
||||
"<if test='obj.dateSo != null and obj.dateSo.end != null'> " +
|
||||
" AND a.moditime <= #{obj.dateSo.end} order by a.moditime desc" +
|
||||
"</if>" +
|
||||
"</script>")
|
||||
// @Select("<script>" +
|
||||
// "SELECT a.stcd AS stcd, a.moditime AS tm, a.z AS waterLevel, " +
|
||||
// "a.q AS flowNum, b.w AS boxNum " +
|
||||
// "FROM st_zqrl_b a " +
|
||||
// "LEFT JOIN st_zvarl_b b ON a.z = b.rz " +
|
||||
// "WHERE 1=1 " +
|
||||
//// "<if test='obj.stcd != null'> " +
|
||||
//// "AND a.stcd = #{obj.stcd} " +
|
||||
//// "</if> " +
|
||||
// "<if test='obj.dateSo != null and obj.dateSo.start != null'> " +
|
||||
// " AND a.moditime >= #{obj.dateSo.start} " +
|
||||
// "</if> " +
|
||||
// "<if test='obj.dateSo != null and obj.dateSo.end != null'> " +
|
||||
// " AND a.moditime <= #{obj.dateSo.end} order by a.moditime desc" +
|
||||
// "</if>" +
|
||||
// "</script>")
|
||||
@Select("""
|
||||
<script>
|
||||
SELECT a.stcd AS stcd, a.moditime AS tm, a.z AS waterLevel,
|
||||
a.q AS flowNum, b.w AS boxNum
|
||||
FROM st_rsvr_r r
|
||||
LEFT JOIN st_zqrl_b a on 1=1
|
||||
LEFT JOIN st_zvarl_b b ON a.z = b.rz
|
||||
WHERE 1=1
|
||||
<if test='obj.dateSo != null and obj.dateSo.start != null'>
|
||||
AND r.tm >= #{obj.dateSo.start}
|
||||
</if>
|
||||
<if test='obj.dateSo != null and obj.dateSo.end != null'>
|
||||
AND r.tm <= #{obj.dateSo.end}
|
||||
</if>
|
||||
order by r.tm asc
|
||||
</script>
|
||||
""")
|
||||
List<StZqrlBVo> flowList(@Param("obj") StZqrlBDto obj);
|
||||
}
|
||||
|
|
@ -138,8 +138,6 @@ public class ReservoirWaterService {
|
|||
|
||||
public List<StZvarlB> zvarl(String stcd) {
|
||||
LambdaQueryWrapper<StZvarlB> queryWrapper = Wrappers.lambdaQuery();
|
||||
queryWrapper.eq(StZvarlB::getStcd, stcd)
|
||||
.orderByAsc(StZvarlB::getPtno);
|
||||
return stZvarlBMapper.selectList(queryWrapper);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB>
|
|||
@Autowired
|
||||
private StZqrlBService stZqrlBService;
|
||||
|
||||
@Autowired
|
||||
private StRsvrRService rsvrRService;
|
||||
|
||||
public List<HomeStStbprpBVo> rainfallStationDetailsList(HomeStStbprpBSo dto) {
|
||||
return baseMapper.rainfallStationDetailsList(dto);
|
||||
|
|
@ -125,7 +127,14 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB>
|
|||
}
|
||||
|
||||
public List<StZqrlBVo> flowList(StZqrlBDto obj){
|
||||
/*
|
||||
* 查出时段内的水位列表，按时间升序排，根据水位查水位流量曲线表得到流量
|
||||
* 第一条数据的累计溢洪量设为0，第二条累计溢洪量=上一条累计溢洪量+本条溢洪流量*60分*60秒，以此类推
|
||||
*/
|
||||
// rsvrRService.
|
||||
List<StZqrlBVo> stZqrlBVos = baseMapper.flowList(obj);
|
||||
List<StZqrlB> zqrlList = stZqrlBService.list();
|
||||
|
||||
BigDecimal runningSum = BigDecimal.ZERO;
|
||||
|
||||
for (StZqrlBVo current : stZqrlBVos) {
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
spring:
|
||||
config:
|
||||
import:
|
||||
- config-common.yml
|
||||
- config-dev.yml
|
||||
- config-ruoyi.yml
|
||||
#mybatis-plus:
|
||||
# mapperLocations: classpath*:mapper/**/*.xml
|
||||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
Loading…
Reference in New Issue