feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/HomePageService.java

@@ -677,25 +677,6 @@ public class HomePageService {
         return result.getResult();
     }
 
-    /**
-     * 获取消纳率
-     * 消纳率:光伏发电/累计用电*100%
-     *
-     * @param powerGeneration  发电
-     * @param powerConsumption 功耗
-     * @return {@link BigDecimal}
-     */
-    private BigDecimal getAbsorptionRate(BigDecimal powerGeneration, BigDecimal powerConsumption) {
-        BigDecimal absorptionRate;
-        if (powerConsumption.compareTo(BigDecimal.ZERO) > 0) {
-            absorptionRate = powerGeneration.divide(powerConsumption, 4, RoundingMode.HALF_UP)
-                    .multiply(BusinessConstant.BIG_DECIMAL_100);
-        } else {
-            absorptionRate = BigDecimal.ZERO;
-        }
-        return absorptionRate;
-    }
-
     /**
      * 查询组织列表下所有线路
      *

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdPhotovoltaicPowerService.java

 package pps.core.prediction.service;
 
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.cloud.base.service.IBasePowerLineCloudService;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
@@ -12,7 +11,6 @@ import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
 import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import pps.core.common.constant.BusinessConstant;
-import pps.core.prediction.entity.EnergyConsumptionAnalysisEnt;
 import pps.core.prediction.entity.ThirdPhotovoltaicPowerEnt;
 import pps.core.prediction.entity.WellheadDailyProductionSituationEnt;
 import pps.core.prediction.mapper.ThirdPhotovoltaicPowerMapper;
@@ -29,8 +27,6 @@ import xstartup.feature.api.annotation.XApiPost;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -102,26 +98,6 @@ public class ThirdPhotovoltaicPowerService {
 
     /*-----------------------------------private-----------------------------------*/
 
-    /**
-     * 分页功能封装查询条件
-     *
-     * @param lineIds   线路ID
-     * @param startTime 开始时间
-     * @param endTime   结束时间
-     * @return {@link LambdaQueryWrapper}<{@link EnergyConsumptionAnalysisEnt}>
-     */
-    private LambdaQueryWrapper<EnergyConsumptionAnalysisEnt> getQueryWrapper4Page(Collection<String> lineIds, Date startTime, Date endTime) {
-        return new QueryWrapper<EnergyConsumptionAnalysisEnt>()
-                .select("IFNULL( SUM( power_generation ), 0 ) AS power_generation",
-                        "IFNULL( SUM( power_consumption ), 0 ) AS power_consumption",
-                        "line_id")
-                .lambda()
-                .in(EnergyConsumptionAnalysisEnt::getLineId, lineIds)
-                .between(EnergyConsumptionAnalysisEnt::getDataDate, startTime, endTime)
-                .groupBy(EnergyConsumptionAnalysisEnt::getLineId)
-                .orderByAsc(EnergyConsumptionAnalysisEnt::getPowerGeneration);
-    }
-
     /**
      * 获取消纳率
      * 消纳率:光伏发电/累计用电*100%
@@ -141,26 +117,6 @@ public class ThirdPhotovoltaicPowerService {
         return absorptionRate;
     }
 
-    /**
-     * 获取环比
-     * (本期-上期) /上期*100%
-     *
-     * @param currentPeriod 本期
-     * @param lastPeriod    上期
-     * @return {@link BigDecimal}
-     */
-    private BigDecimal getCycleRatio(BigDecimal currentPeriod, BigDecimal lastPeriod) {
-        BigDecimal cycleRatio;
-        if (lastPeriod.compareTo(BigDecimal.ZERO) > 0) {
-            cycleRatio = currentPeriod.subtract(lastPeriod)
-                    .divide(lastPeriod, 4, RoundingMode.HALF_UP)
-                    .multiply(BusinessConstant.BIG_DECIMAL_100);
-        } else {
-            cycleRatio = BigDecimal.ZERO;
-        }
-        return cycleRatio;
-    }
-
     /**
      * 获取所有path包含组织ID的组织
      *