年收益

2025年2月28日14:41:32

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<PlantMapper, PlantEntity>
                   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);