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

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C00-common/pps-common/src/main/java/pps/core/common/utils/CollectorsUtil.java

+package pps.core.common.utils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Collections;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+
+/**
+ * 收集器util
+ *
+ * @author ZWT
+ * @date 2024/06/03
+ */
+public class CollectorsUtil {
+    static final Set<Collector.Characteristics> CH_NOID = Collections.emptySet();
+
+    private CollectorsUtil() {
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <I, R> Function<I, R> castingIdentity() {
+        return i -> (R) i;
+    }
+
+    static class CollectorImpl<T, A, R> implements Collector<T, A, R> {
+        private final Supplier<A> supplier;
+        private final BiConsumer<A, T> accumulator;
+        private final BinaryOperator<A> combiner;
+        private final Function<A, R> finisher;
+        private final Set<Characteristics> characteristics;
+
+        CollectorImpl(Supplier<A> supplier, BiConsumer<A, T> accumulator, BinaryOperator<A> combiner,
+                      Function<A, R> finisher, Set<Characteristics> characteristics) {
+            this.supplier = supplier;
+            this.accumulator = accumulator;
+            this.combiner = combiner;
+            this.finisher = finisher;
+            this.characteristics = characteristics;
+        }
+
+        CollectorImpl(Supplier<A> supplier, BiConsumer<A, T> accumulator, BinaryOperator<A> combiner,
+                      Set<Characteristics> characteristics) {
+            this(supplier, accumulator, combiner, castingIdentity(), characteristics);
+        }
+
+        @Override
+        public BiConsumer<A, T> accumulator() {
+            return accumulator;
+        }
+
+        @Override
+        public Supplier<A> supplier() {
+            return supplier;
+        }
+
+        @Override
+        public BinaryOperator<A> combiner() {
+            return combiner;
+        }
+
+        @Override
+        public Function<A, R> finisher() {
+            return finisher;
+        }
+
+        @Override
+        public Set<Characteristics> characteristics() {
+            return characteristics;
+        }
+    }
+
+    //求和方法
+    public static <T> Collector<T, ?, BigDecimal> summingBigDecimal(ToBigDecimalFunction<? super T> mapper) {
+        return new CollectorImpl<>(
+                () -> new BigDecimal[]{BigDecimal.ZERO},
+                (a, t) -> {
+                    a[0] = a[0].add(mapper.applyAsBigDecimal(t));
+                },
+                (a, b) -> {
+                    a[0] = a[0].add(b[0]);
+                    return a;
+                },
+                a -> a[0], CH_NOID);
+    }
+
+    //求最大值
+    public static <T> Collector<T, ?, BigDecimal> maxBy(ToBigDecimalFunction<? super T> mapper) {
+        return new CollectorImpl<>(
+                () -> new BigDecimal[]{new BigDecimal(Long.MIN_VALUE)},
+                (a, t) -> {
+                    a[0] = a[0].max(mapper.applyAsBigDecimal(t));
+                },
+                (a, b) -> {
+                    a[0] = a[0].max(b[0]);
+                    return a;
+                },
+                a -> a[0], CH_NOID);
+    }
+
+    //求最小值
+    public static <T> Collector<T, ?, BigDecimal> minBy(ToBigDecimalFunction<? super T> mapper) {
+        return new CollectorImpl<>(
+                () -> new BigDecimal[]{new BigDecimal(Long.MAX_VALUE)},
+                (a, t) -> {
+                    a[0] = a[0].min(mapper.applyAsBigDecimal(t));
+                },
+                (a, b) -> {
+                    a[0] = a[0].min(b[0]);
+                    return a;
+                },
+                a -> a[0], CH_NOID);
+    }
+
+    /**
+     * 求平均值
+     *
+     * @param mapper
+     * @param newScale     保留newScale位小数
+     * @param roundingMode 舍去规则（0 <= roundingMode <= 7）
+     * @param <T>
+     * @return
+     */
+    public static <T> Collector<T, ?, BigDecimal> averagingBigDecimal(ToBigDecimalFunction<? super T> mapper, int newScale, int roundingMode) {
+        return new CollectorImpl<>(
+                () -> new BigDecimal[]{BigDecimal.ZERO, BigDecimal.ZERO},
+                (a, t) -> {
+                    a[0] = a[0].add(mapper.applyAsBigDecimal(t));
+                    a[1] = a[1].add(BigDecimal.ONE);
+                },
+                (a, b) -> {
+                    a[0] = a[0].add(b[0]);
+                    return a;
+                },
+                a -> a[0].divide(a[1], RoundingMode.HALF_UP).setScale(newScale, roundingMode), CH_NOID);
+    }
+}
\ No newline at end of file

C00-common/pps-common/src/main/java/pps/core/common/utils/ToBigDecimalFunction.java

+package pps.core.common.utils;
+
+import java.math.BigDecimal;
+
+/**
+ * 到大小数函数
+ *
+ * @author ZWT
+ * @date 2024/06/03
+ */
+@FunctionalInterface
+public interface ToBigDecimalFunction<T> {
+    /**
+     * 应用为大小数
+     *
+     * @param value 价值
+     * @return {@link BigDecimal }
+     */
+    BigDecimal applyAsBigDecimal(T value);
+}
\ No newline at end of file

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeBaseService.java

@@ -35,10 +35,12 @@ import pps.cloud.prediction.service.data.storage_predicted_power_data.DynamicQue
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import pps.core.common.utils.BaseUtils;
+import pps.core.common.utils.CollectorsUtil;
 import pps.core.space.entity.*;
 import pps.core.space.enums.BusinessError;
 import pps.core.space.mapper.*;
 import pps.core.space.service.data.*;
+import pps.core.space.service.data.space_optimize_period.GetPredictedPowerOutput;
 import pps.core.space.service.data.space_optimize_period.GetSpaceOptimizePeriodInput;
 import pps.core.space.service.data.space_optimize_period.GetSpaceOptimizePeriodOutput;
 import pps.core.space.service.data.space_optimize_period.GetSpaceOptimizeWellheadOutput;
@@ -102,16 +104,36 @@ public class SpaceOptimizeBaseService {
             output.setStrategyDetailList(Collections.emptyList());
         }
         //查功率预测信息
-        output.setPowerGenerationList(
-                this.getAveragePowerGenerationHourList(context, DynamicQueryPlantPredictedPowerInput.builder()
-                        .plantIds(this.getOptimizeLineRelation(context, CollUtil.newArrayList(detailEnt))
-                                .getPlantIdsByLineIdMap()
-                                .get(detailEnt.getLineId()))
-                        .startTime(optimizeDate.toString())
-                        .endTime(DateUtil.offsetDay(optimizeDate, 1).toString())
-                        .dateType(dateType)
-                        .build())
-        );
+        List<DynamicQueryPlantPredictedPowerOutput> hourList = this.getAveragePowerGeneration15List(context, DynamicQueryPlantPredictedPowerInput.builder()
+                .plantIds(this.getOptimizeLineRelation(context, CollUtil.newArrayList(detailEnt))
+                        .getPlantIdsByLineIdMap()
+                        .get(detailEnt.getLineId()))
+                .startTime(optimizeDate.toString())
+                .endTime(DateUtil.offsetDay(optimizeDate, 1).toString())
+                .dateType(dateType)
+                .build());
+        Map<String, BigDecimal> collect;
+        if (CollUtil.isNotEmpty(hourList)) {
+            collect = hourList.stream()
+                    .collect(
+                            Collectors.groupingBy(DynamicQueryPlantPredictedPowerOutput::getHourTime,
+                                    CollectorsUtil.averagingBigDecimal(DynamicQueryPlantPredictedPowerOutput::getPower, 2, 0))
+                    );
+        } else {
+            collect = Collections.emptyMap();
+        }
+        List<GetPredictedPowerOutput> powerGenerationList = new ArrayList<>(24);
+        String key;
+        BigDecimal power;
+        for (int i = 0; i < 24; i++) {
+            key = String.valueOf(i);
+            power = collect.getOrDefault(key, BigDecimal.ZERO);
+            powerGenerationList.add(GetPredictedPowerOutput.builder()
+                    .hourTime(key)
+                    .power(power)
+                    .build());
+        }
+        output.setPowerGenerationList(powerGenerationList);
         //查井口列表
         output.setWellheadList(this.getSpaceOptimizeWellheadList(context, flag, periodId, optimizeDate));
         return output;
@@ -1183,6 +1205,20 @@ public class SpaceOptimizeBaseService {
         }
     }
 
+    /**
+     * 获取每15分钟发电量列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link List}<{@link DynamicQueryPlantPredictedPowerOutput}>
+     */
+    public List<DynamicQueryPlantPredictedPowerOutput> getAveragePowerGeneration15List(XContext context, DynamicQueryPlantPredictedPowerInput input) {
+        IPlantPredictedPowerCloudService cloudService = context.getBean(IPlantPredictedPowerCloudService.class);
+        XListResult<DynamicQueryPlantPredictedPowerOutput> result = cloudService.queryAveragePowerGenerationListByParam(context, input);
+        result.throwIfFail();
+        return result.getResult();
+    }
+
     /**
      * 获取每小时平均发电量列表
      *

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_period/GetPredictedPowerOutput.java

+package pps.core.space.service.data.space_optimize_period;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+
+/**
+ * 功率预测
+ *
+ * @author ZWT
+ * @date 2024/06/03 09:51
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class GetPredictedPowerOutput {
+
+    @XText("时")
+    private String hourTime;
+
+    @XText("预测功率")
+    private BigDecimal power;
+}

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_period/GetSpaceOptimizePeriodOutput.java

@@ -2,7 +2,6 @@ package pps.core.space.service.data.space_optimize_period;
 
 import lombok.Data;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
-import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
 import pps.core.space.service.data.SpaceOptimizeDateOutput;
 import xstartup.annotation.XText;
 
@@ -36,7 +35,7 @@ public class GetSpaceOptimizePeriodOutput {
      * 功率预测列表
      */
     @XText("功率预测列表")
-    List<DynamicQueryPlantPredictedPowerOutput> powerGenerationList;
+    List<GetPredictedPowerOutput> powerGenerationList;
     @XText("ID")
     private String id;
     @XText("线路ID")

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/PredictedPowerViewMapper.xml

@@ -9,6 +9,7 @@
 
     <select id="selectMidPowerList" resultMap="BaseResultMap">
         SELECT
+        HOUR( a.create_time ) AS hour_time,
         IFNULL( AVG( a.predict_power ), 0 ) AS power,
         a.create_time AS create_time
         FROM
@@ -38,6 +39,7 @@
 
     <select id="selectShortPowerList" resultMap="BaseResultMap">
         SELECT
+        HOUR( a.create_time ) AS hour_time,
         IFNULL( AVG( a.predict_power ), 0 ) AS power,
         a.create_time AS create_time
         FROM