From 41010ca181fa57b5a619da8a01dae133c13f9ddd Mon Sep 17 00:00:00 2001 From: liangshan Date: Wed, 2 Apr 2025 10:13:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gunshi/project/xyt/service/ReservoirWaterService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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.监测水位不在库容曲线范围内，无法计算当前库容