1:洪水预报
parent
a06b269f36
commit
59a67a3b61
|
|
@ -28,6 +28,8 @@ import java.math.BigDecimal;
|
||||||
import java.math.RoundingMode;
|
import java.math.RoundingMode;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.ZoneId;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
@ -257,6 +259,21 @@ public class ForecastResultsService extends ServiceImpl<ForecastResultsMapper, F
|
||||||
List<StZvarlB> zvarlBS = stZvarlBService.list(new QueryWrapper<StZvarlB>().eq("stcd", attResBase.getStcd()).orderBy(true, true, "rz"));
|
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));
|
||||||
|
for (StRsvrR stRsvrR : rsvrRRealList) {
|
||||||
|
// 使用Java 8时间API
|
||||||
|
Date originalTime = stRsvrR.getTm();
|
||||||
|
if (originalTime != null) {
|
||||||
|
LocalDateTime ldt = originalTime.toInstant()
|
||||||
|
.atZone(ZoneId.systemDefault())
|
||||||
|
.toLocalDateTime()
|
||||||
|
.withMinute(0)
|
||||||
|
.withSecond(0)
|
||||||
|
.withNano(0);
|
||||||
|
|
||||||
|
Date truncatedTime = Date.from(ldt.atZone(ZoneId.systemDefault()).toInstant());
|
||||||
|
stRsvrR.setTm(truncatedTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
List<StRsvrR> resultList = reorganizeRsvrRData(rsvrRRealList, dt);
|
List<StRsvrR> resultList = reorganizeRsvrRData(rsvrRRealList, dt);
|
||||||
List<Date[]> periods = splitByDay8To8(startTime, endTime);
|
List<Date[]> periods = splitByDay8To8(startTime, endTime);
|
||||||
// v:累计降雨
|
// v:累计降雨
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue