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

解决布置图-渗流查询报错

master
wany 2024-08-26 16:46:29 +08:00
parent 9151c708fa
commit 3702da0c36
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java
View File

@ -392,24 +392,26 @@ public class OsmoticPressRService extends ServiceImpl<OsmoticPressRMapper, Osmot
} }
OsmoticQuerySo so = new OsmoticQuerySo(); OsmoticQuerySo so = new OsmoticQuerySo();
List<String> stationCodes = list.stream().map(OsmoticPressVo::getStationCode).collect(Collectors.toList()); List<String> stationCodes = list.stream().map(OsmoticPressVo::getStationCode).collect(Collectors.toList());
String maxTm = list.stream().filter(o->o.getTm() != null).max(Comparator.comparing(OsmoticPressVo::getTm)).get().getTm(); if(list.stream().filter(o->o.getTm() != null).collect(Collectors.toList()).size() > 0 ){
String minTm = list.stream().filter(o->o.getTm() != null).min(Comparator.comparing(OsmoticPressVo::getTm)).get().getTm(); String maxTm = list.stream().filter(o->o.getTm() != null).max(Comparator.comparing(OsmoticPressVo::getTm)).get().getTm();
so.setStationCodes(stationCodes); String minTm = list.stream().filter(o->o.getTm() != null).min(Comparator.comparing(OsmoticPressVo::getTm)).get().getTm();
DateTimeRangeSo dateTimeRangeSo = new DateTimeRangeSo(); so.setStationCodes(stationCodes);
dateTimeRangeSo.setStart(DateUtil.convertStringToDate(minTm)); DateTimeRangeSo dateTimeRangeSo = new DateTimeRangeSo();
dateTimeRangeSo.setEnd(DateUtil.convertStringToDate(maxTm)); dateTimeRangeSo.setStart(DateUtil.convertStringToDate(minTm));
so.setDateTimeRangeSo(dateTimeRangeSo); dateTimeRangeSo.setEnd(DateUtil.convertStringToDate(maxTm));
List<OsmoticValueVo> warnList = baseMapper.queryWarn(so); so.setDateTimeRangeSo(dateTimeRangeSo);
list.stream().map(o->{ List<OsmoticValueVo> warnList = baseMapper.queryWarn(so);
if(o.getTm() != null && DateUtil.hoursBetweenDate(DateUtil.convertStringToDate(o.getTm()), new Date()) > 48){ list.stream().map(o->{
o.setFlag(1); if(o.getTm() != null && DateUtil.hoursBetweenDate(DateUtil.convertStringToDate(o.getTm()), new Date()) > 48){
} o.setFlag(1);
Boolean b = warnList.stream().filter(t->t.getStationCode().equals(o.getStationCode()) && t.getTm().equals(o.getTm())).findAny().isPresent(); }
if(b){ Boolean b = warnList.stream().filter(t->t.getStationCode().equals(o.getStationCode()) && t.getTm().equals(o.getTm())).findAny().isPresent();
o.setStatus(1); if(b){
} o.setStatus(1);
return o; }
}).collect(Collectors.toList()); return o;
}).collect(Collectors.toList());
}
return list; return list;
} }