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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -39,5 +39,4 @@ public class PlantPredictedPowerMidTermService {
     public XListResult<GetPredictedPowerOutput> getTenPlantPredictedPowerMidTermList(XContext context, GetPlantPredictedPowerMidTermInput input) {
         return XListResult.success(ServiceUtil.getPredictedPowerOutput(context, input.getStartTime(), input.getPlantId(), 10, 2));
     }
-
 }
\ No newline at end of file

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

@@ -45,6 +45,4 @@ public class PlantPredictedPowerShortTermService {
     public XListResult<GetPredictedPowerOutput> getOnePlantPredictedPowerShortTermList(XContext context, GetPlantPredictedPowerShortTermInput input) {
         return XListResult.success(ServiceUtil.getPredictedPowerOutput(context, input.getStartTime(), input.getPlantId(), 1, 1));
     }
-
-
 }
\ No newline at end of file

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/utils/ServiceUtil.java

@@ -116,6 +116,7 @@ public class ServiceUtil {
         }
         DateTime beginTime = DateUtil.offsetMinute(day, -1);
         DateTime endTime = DateUtil.offsetDay(day, offsetDay);
+        showTime = DateUtil.offsetDay(showTime, offsetDay);
         //查预测功率
         Map<DateTime, BigDecimal> predictedMap;
         switch (cycle) {
@@ -170,17 +171,23 @@ public class ServiceUtil {
         List<DateTime> rangeToList = DateUtil.rangeToList(day, endTime, DateField.MINUTE, 15);
         GetPredictedPowerOutput output;
         List<GetPredictedPowerOutput> outputs = new ArrayList<>(rangeToList.size());
+        Date dataDate;
         for (DateTime dateTime : rangeToList) {
             output = new GetPredictedPowerOutput();
+            //时间偏移
+            if (betweenDay != 0) {
+                dataDate = DateUtil.offsetDay(dateTime, betweenDay);
+            } else {
+                dataDate = dateTime;
+            }
+            output.setDataDate(dataDate);
             //匹配预测发电量
             output.setPredictPower(predictedMap.getOrDefault(dateTime, BigDecimal.ZERO));
             //匹配实际发电量
-            output.setPower(powerMap.getOrDefault(dateTime, BigDecimal.ZERO));
-            //时间偏移
-            if (betweenDay != 0) {
-                output.setDataDate(DateUtil.offsetDay(dateTime, betweenDay));
+            if (DateUtil.compare(dataDate, date) > 0) {
+                output.setPower(BigDecimal.ZERO);
             } else {
-                output.setDataDate(dateTime);
+                output.setPower(powerMap.getOrDefault(dateTime, BigDecimal.ZERO));
             }
             outputs.add(output);
         }