feat(吉林演示): 松原

1.开发中间库表结构及数据导出功能,检查中间库表结构是否有变动,同时获取最新数据,验证数据是否更新;
2.创建场站每日信息统计记录表,新建场站日信息数据采集汇总定时任务,整理汇总场站纬度每日数据,完成功能验证;
3.针对吉林提供的统计数据,对吉林首页部分功能修改;
4.针对中间库每日井口数据统计表结构变动,修改井口日统计定时任务数据处理逻辑,完成功能验证;
5.修改日发电量统计定时任务,排查数据丢失问题,完成功能验证;
6.修改场站每日信息汇总统计定时任务,增加统计每日光伏发电量逻辑,修改表结构及数据结构和业务处理逻辑,完成功能验证;
7.修改吉林首页线路详情接口,区分部署环境,增加吉林个性化数据处理逻辑,完成接口冒烟测试;
8.修改实际发电功率统计定时任务,排查数据丢失问题,完成功能验证;
9.修改实际发电量统计定时任务,排查数据丢失问题,完成功能验证;
10.修改吉林首页井场效果评价数据统计接口,区分部署环境,增加吉林个性化数据处理逻辑,完成接口冒烟测试;
11.能耗分析页面开发吉林个性化功能,完成电量统计接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;
12.能耗分析页面开发吉林个性化功能,完成发电量统计接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;
13.能耗分析页面开发吉林个性化功能,完成用电量统计接口开发,编辑线上接口文档并生成接口用例,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -102,7 +102,7 @@ public class EnergyConsumptionAnalysisService {
     }
 
     /**
-     * 生成统计列表
+     * 发电量统计
      *
      * @param context 上下文
      * @param input   输入
@@ -111,6 +111,31 @@ public class EnergyConsumptionAnalysisService {
     @XText("能耗分析--发电量统计")
     @XApiPost
     public XListResult<GetElectricityStatisticsOutput> generateStatisticsList(XContext context, GetStatisticsInput input) {
+        return XListResult.success(this.getStatisticsList(context, input, false));
+    }
+
+    /**
+     * 用电量统计
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult }<{@link GetElectricityStatisticsOutput }>
+     */
+    @XText("能耗分析--用电量统计")
+    @XApiPost
+    public XListResult<GetElectricityStatisticsOutput> useStatisticsList(XContext context, GetStatisticsInput input) {
+        return XListResult.success(this.getStatisticsList(context, input, true));
+    }
+
+    /**
+     * 获取统计列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @param isUse   是否用电
+     * @return {@link List }<{@link GetElectricityStatisticsOutput }>
+     */
+    private List<GetElectricityStatisticsOutput> getStatisticsList(XContext context, GetStatisticsInput input, boolean isUse) {
         //日期初始化
         input.getBetweenDate();
         Date beginTime = input.getBeginTime();
@@ -125,7 +150,7 @@ public class EnergyConsumptionAnalysisService {
             currentMap = Collections.emptyMap();
         } else {
             currentMap = currentList.stream()
-                    .collect(Collectors.toMap(StationDailyProductionSituationEnt::getDataDate, StationDailyProductionSituationEnt::getPhotovoltaicPower));
+                    .collect(Collectors.toMap(StationDailyProductionSituationEnt::getDataDate, isUse ? StationDailyProductionSituationEnt::getDailyElectricityConsumption : StationDailyProductionSituationEnt::getPhotovoltaicPower));
         }
         List<StationDailyProductionSituationEnt> lastList = this.getStationDailyStatisticsList(context, DateUtil.offset(beginTime, DateField.YEAR, -1), DateUtil.offset(endTime, DateField.YEAR, -1), lineNameSet, yearFlag);
         Map<Date, BigDecimal> lastMap;
@@ -133,25 +158,28 @@ public class EnergyConsumptionAnalysisService {
             lastMap = Collections.emptyMap();
         } else {
             lastMap = lastList.stream()
-                    .collect(Collectors.toMap(StationDailyProductionSituationEnt::getDataDate, StationDailyProductionSituationEnt::getPhotovoltaicPower));
+                    .collect(Collectors.toMap(StationDailyProductionSituationEnt::getDataDate, isUse ? StationDailyProductionSituationEnt::getDailyElectricityConsumption : StationDailyProductionSituationEnt::getPhotovoltaicPower));
         }
         //封装数据
         DateTime now = DateUtil.date();
         List<DateTime> rangeToList = DateUtil.rangeToList(beginTime, endTime, yearFlag ? DateField.MONTH : DateField.DAY_OF_YEAR);
         List<GetElectricityStatisticsOutput> outputs = new ArrayList<>(rangeToList.size());
+        GetElectricityStatisticsOutput output;
         for (DateTime dateTime : rangeToList) {
             if (DateUtil.compare(dateTime, now) > 0) {
                 break;
             }
-            outputs.add(
-                    GetElectricityStatisticsOutput.builder()
-                            .currentPeriodGenerate(currentMap.getOrDefault(dateTime, BigDecimal.ZERO))
-                            .lastPeriodGenerate(lastMap.getOrDefault(dateTime, BigDecimal.ZERO))
-                            .dateStr(yearFlag ? dateTime.toString("yyyy-MM") : dateTime.toDateStr())
-                            .build()
-            );
+            output = new GetElectricityStatisticsOutput();
+            if (isUse) {
+                output.setCurrentPeriodUse(currentMap.getOrDefault(dateTime, BigDecimal.ZERO));
+                output.setLastPeriodUse(lastMap.getOrDefault(dateTime, BigDecimal.ZERO));
+            } else {
+                output.setCurrentPeriodGenerate(currentMap.getOrDefault(dateTime, BigDecimal.ZERO));
+                output.setLastPeriodGenerate(lastMap.getOrDefault(dateTime, BigDecimal.ZERO));
+            }
+            outputs.add(output);
         }
-        return XListResult.success(outputs);
+        return outputs;
     }
 
     /**
@@ -217,8 +245,6 @@ public class EnergyConsumptionAnalysisService {
         );
     }
 
-
-
     /*------------------------------ 能耗分析(长庆) ------------------------------*/
 
     /**