解决水库水情报错
parent
00c61ef1a7
commit
9d28e5ad65
|
|
@ -73,7 +73,7 @@ public class ReservoirWaterService {
|
|||
continue;
|
||||
}
|
||||
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));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public class DataHandleUtil {
|
|||
BigDecimal lowerW = 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) {
|
||||
lowerRz = list.get(i);
|
||||
upperRz = list.get(i+1);
|
||||
|
|
|
|||
Loading…
Reference in New Issue