From 6bf01b8fbd7378fc5b9d99b4fbb5a13359cc5748 Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 28 Feb 2025 14:41:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E6=94=B6=E7=9B=8A=202025=E5=B9=B42?= =?UTF-8?q?=E6=9C=8828=E6=97=A514:41:32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qingyuan/manageboard/service/impl/PlantServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java index 983ff4b..40530b0 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java +++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java @@ -28,7 +28,6 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; -import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import static com.mybatisflex.core.query.QueryMethods.column; @@ -126,8 +125,8 @@ public class PlantServiceImpl extends BaseServiceImpl photovoltaicOverviewDTO.setProfit(finalIncomeTotal.divide(new BigDecimal(10000), 4, RoundingMode.HALF_UP)); */ //年收益 - BigDecimal finalIncomeTotal = CalculationUtil.income(electricityUsage, list.get(0).getUnitProfit(), 2);; - photovoltaicOverviewDTO.setProfit(finalIncomeTotal.divide(new BigDecimal(10000), 4, RoundingMode.HALF_UP)); + BigDecimal finalIncomeTotal = electricityUsage.multiply(list.get(0).getUnitProfit()).divide(new BigDecimal(10000), 4, RoundingMode.HALF_UP); + photovoltaicOverviewDTO.setProfit(finalIncomeTotal); //上网量 TODO BigDecimal internetUsage = tsKvDTOList.stream().filter(s -> StringUtils.equals(s.getAttrKey(), attrA30yy)) .map(s -> new BigDecimal(s.getVal())).reduce(BigDecimal.ZERO, BigDecimal::add);