diff --git a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java index 851e299..899652e 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ReservoirWaterService.java @@ -152,7 +152,8 @@ public class ReservoirWaterService { private void calcTqData(List rzData, List zqrl) { BigDecimal maxRz = zqrl.stream().max(Comparator.comparing(StZvarlB::getRz)).get().getRz(); BigDecimal minRz = zqrl.stream().min(Comparator.comparing(StZvarlB::getRz)).get().getRz(); - Map map = zqrl.stream().collect(Collectors.toMap(StZvarlB::getRz, StZvarlB::getW)); + Map map = zqrl.stream().collect(Collectors.toMap(StZvarlB::getRz, StZvarlB::getW, + (existing, replacement) -> existing)); /** * 根据监测水位和库容曲线计算出当前库容 * 计算规则:1.监测水位不在库容曲线范围内,无法计算当前库容