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

解决水库水情报错

master
wany 2024-08-15 17:18:21 +08:00
parent 00c61ef1a7
commit 9d28e5ad65
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java
View File

@ -73,7 +73,7 @@ public class ReservoirWaterService {
continue; continue;
} }
Map<BigDecimal, BigDecimal> stZvalMap = zvarlBS.stream().collect(Collectors.toMap(StZvarlB::getRz, StZvarlB::getW)); Map<BigDecimal, BigDecimal> stZvalMap = zvarlBS.stream().collect(Collectors.toMap(StZvarlB::getRz, StZvarlB::getW));
List<BigDecimal> list = zvarlBS.stream().map(StZvarlB::getRz).collect(Collectors.toList()); List<BigDecimal> list = zvarlBS.stream().map(StZvarlB::getRz).sorted().collect(Collectors.toList());
vo.setNowCap(DataHandleUtil.calcData(rz,stZvalMap,list)); vo.setNowCap(DataHandleUtil.calcData(rz,stZvalMap,list));
} }
} }

2
src/main/java/com/gunshi/project/xyt/util/DataHandleUtil.java
View File

@ -31,7 +31,7 @@ public class DataHandleUtil {
BigDecimal lowerW = new BigDecimal(0); BigDecimal lowerW = new BigDecimal(0);
BigDecimal upperW = new BigDecimal(0); BigDecimal upperW = new BigDecimal(0);
for(int i=0;i<list.size();i++){ for(int i=0;i<list.size()-1;i++){
if (rz.compareTo(list.get(i)) >= 0 && rz.compareTo(list.get(i+1)) <= 0) { if (rz.compareTo(list.get(i)) >= 0 && rz.compareTo(list.get(i+1)) <= 0) {
lowerRz = list.get(i); lowerRz = list.get(i);
upperRz = list.get(i+1); upperRz = list.get(i+1);