yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

洪水预报优化

master
cxw 2024-10-21 09:16:25 +08:00
parent 49cef18716
commit f8651d12a5
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gunshi/project/xyt/service/ForecastResultsService.java
View File

@ -192,7 +192,12 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
} else { } else {
qwExisted = new QueryWrapper<StPptnR>().in("stcd", stbs.stream().map(StStbprpB::getStcd).toArray(String[]::new)).ge("tm", startTime).le("tm", nowHourTime).orderBy(true, true, "tm"); qwExisted = new QueryWrapper<StPptnR>().in("stcd", stbs.stream().map(StStbprpB::getStcd).toArray(String[]::new)).ge("tm", startTime).le("tm", nowHourTime).orderBy(true, true, "tm");
// 获取预报数据 // 获取预报数据
try {
pptnRFutureList = getForecastDrpData(nowHourTime, ""); pptnRFutureList = getForecastDrpData(nowHourTime, "");
} catch (IllegalArgumentException e) {
isHaveFuturePPtn = false;
log.error("该时间无预报数据");
}
} }
List<StPptnR> pptnRExistedList = stPptnRService.list(qwExisted); List<StPptnR> pptnRExistedList = stPptnRService.list(qwExisted);
pptnRAllList.addAll(pptnRExistedList); pptnRAllList.addAll(pptnRExistedList);
@ -253,9 +258,9 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
} }
H1 = Double.parseDouble(rsvrR.getRz()); H1 = Double.parseDouble(rsvrR.getRz());
// 泄流量 // 泄流量
List<StZqrlB> stZqrlBList = stZqrlBService.list(new QueryWrapper<StZqrlB>().eq("stcd", attResBase.getStcd())); List<StZqrlB> stZqrlBList = stZqrlBService.list(new QueryWrapper<StZqrlB>().eq("stcd", attResBase.getStcd()).orderBy(true, true, "z"));
// 库容曲线 // 库容曲线
List<StZvarlB> zvarlBS = stZvarlBService.list(new QueryWrapper<StZvarlB>().eq("stcd", attResBase.getStcd())); List<StZvarlB> zvarlBS = stZvarlBService.list(new QueryWrapper<StZvarlB>().eq("stcd", attResBase.getStcd()).orderBy(true, true, "rz"));
// 水位历史数据 // 水位历史数据
List<StRsvrR> rsvrRRealList = stRsvrRService.list(new QueryWrapper<StRsvrR>().eq("stcd", attResBase.getStcd()).ge("tm", startTime).le("tm", endTime)); List<StRsvrR> rsvrRRealList = stRsvrRService.list(new QueryWrapper<StRsvrR>().eq("stcd", attResBase.getStcd()).ge("tm", startTime).le("tm", endTime));
List<StRsvrR> resultList = reorganizeRsvrRData(rsvrRRealList, dt); List<StRsvrR> resultList = reorganizeRsvrRData(rsvrRRealList, dt);
@ -406,7 +411,6 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
tm = eightSdf.format(now); tm = eightSdf.format(now);
} }
tm = tm.replaceAll(" ", "").replaceAll("-", ""); tm = tm.replaceAll(" ", "").replaceAll("-", "");
try {
List<RainGrib2Layer> gribList = forecastService.getGribData(tm, false); List<RainGrib2Layer> gribList = forecastService.getGribData(tm, false);
//24小时每个网格的总量 //24小时每个网格的总量
List<RainGrib2Layer> total = gribList.stream().filter(o -> o.getTmRange().getInterval() == 24).collect(Collectors.toList()); List<RainGrib2Layer> total = gribList.stream().filter(o -> o.getTmRange().getInterval() == 24).collect(Collectors.toList());
@ -425,7 +429,7 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
if (CollectionUtils.isNotEmpty(data)) { if (CollectionUtils.isNotEmpty(data)) {
for (ForeRainTimeVo foreRainTimeVo : data) { for (ForeRainTimeVo foreRainTimeVo : data) {
// 只取当前时间之后的数据 // 只取当前时间之后的数据
if(foreRainTimeVo.getTm().compareTo(now) > 0){ if (foreRainTimeVo.getTm().compareTo(now) > 0) {
StPptnR stPptnR = new StPptnR(); StPptnR stPptnR = new StPptnR();
stPptnR.setStcd(stcd); stPptnR.setStcd(stcd);
stPptnR.setTm(foreRainTimeVo.getTm()); stPptnR.setTm(foreRainTimeVo.getTm());
@ -434,9 +438,6 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
} }
} }
} }
} catch (IllegalArgumentException e) {
e.printStackTrace();
}
return pptnRFutureList; return pptnRFutureList;
} }