feat(吉林演示): 松原

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -186,11 +186,12 @@ public class SpaceOptimizeBaseService {
                         continue;
                     }
                     //查光伏预测
-                    powerList = this.getAveragePowerHalfHour(context, DynamicQueryPlantPredictedPowerInput.builder()
+                    powerList = this.getAveragePower(context, DynamicQueryPlantPredictedPowerInput.builder()
                             .plantIds(plantIds)
                             .startTime(begin.toString(BusinessConstant.DATE_FORMAT_DAY))
                             .endTime(DateUtil.offsetDay(begin, 1).toString(BusinessConstant.DATE_FORMAT_DAY))
                             .dateType(dateType)
+                            .formatType(0)
                             .build());
                     //遍历井
                     for (SpaceOptimizeWellheadDTO spaceWell : wellDateMap.get(begin)) {
@@ -431,7 +432,7 @@ public class SpaceOptimizeBaseService {
                 optimizeDate = DateUtil.offsetDay(startDate, d + 1);
                 recordTime = offset > 1 ? begin : optimizeDate;
                 //查预测光伏出力
-                powerList = this.getAveragePowerHalfHour(context, DynamicQueryPlantPredictedPowerInput.builder()
+                powerList = this.getAveragePower(context, DynamicQueryPlantPredictedPowerInput.builder()
                         .plantIds(plantIds)
                         .startTime(begin.toString(BusinessConstant.DATE_FORMAT_DAY))
                         .endTime(optimizeDate.toString(BusinessConstant.DATE_FORMAT_DAY))
@@ -1321,15 +1322,15 @@ public class SpaceOptimizeBaseService {
     }
 
     /**
-     * 获得半小时平均功率
+     * 获得平均功率
      *
      * @param context 上下文
      * @param input   输入
      * @return {@link List}<{@link DynamicQueryPlantPredictedPowerOutput}>
      */
-    public List<DynamicQueryPlantPredictedPowerOutput> getAveragePowerHalfHour(XContext context, DynamicQueryPlantPredictedPowerInput input) {
+    public List<DynamicQueryPlantPredictedPowerOutput> getAveragePower(XContext context, DynamicQueryPlantPredictedPowerInput input) {
         IPlantPredictedPowerCloudService cloudService = context.getBean(IPlantPredictedPowerCloudService.class);
-        XListResult<DynamicQueryPlantPredictedPowerOutput> result = cloudService.queryAveragePowerHalfHour(context, input);
+        XListResult<DynamicQueryPlantPredictedPowerOutput> result = cloudService.queryAveragePower(context, input);
         result.throwIfFail();
         return result.getResult();
     }

C12-prediction/pps-cloud-prediction/src/main/java/pps/cloud/prediction/service/IPlantPredictedPowerCloudService.java

@@ -29,14 +29,14 @@ public interface IPlantPredictedPowerCloudService {
     XListResult<DynamicQueryPlantPredictedPowerOutput> queryAveragePowerGenerationListByParam(XContext context, DynamicQueryPlantPredictedPowerInput input);
 
     /**
-     * 获得半小时平均功率
+     * 获得平均功率
      *
      * @param context 上下文
      * @param input   输入
      * @return {@link XListResult}<{@link DynamicQueryPlantPredictedPowerOutput}>
      */
-    @XText("光伏预测Cloud模块--获得半小时平均功率")
-    XListResult<DynamicQueryPlantPredictedPowerOutput> queryAveragePowerHalfHour(XContext context, DynamicQueryPlantPredictedPowerInput input);
+    @XText("光伏预测Cloud模块--获得平均功率")
+    XListResult<DynamicQueryPlantPredictedPowerOutput> queryAveragePower(XContext context, DynamicQueryPlantPredictedPowerInput input);
 
     /**
      * 光伏预测Cloud模块--获取每小时平均发电量列表

C12-prediction/pps-cloud-prediction/src/main/java/pps/cloud/prediction/service/data/plant_predicted_power_data/DynamicQueryPlantPredictedPowerInput.java

@@ -43,6 +43,6 @@ public class DynamicQueryPlantPredictedPowerInput {
     @XText("日期类型:0_长期;1_中短期")
     private Integer dateType;
 
-    @XText("日期格式化类型:0_15分钟;1_1小时")
+    @XText("日期格式化类型:0_15分钟;1_1小时;2_30分钟")
     private Integer formatType;
 }

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/PredictedPowerView.java

@@ -51,7 +51,7 @@ public class PredictedPowerView {
     @TableField(exist = false)
     private List<String> plantIds;
 
-    @XText("日期格式化类型:0_15分钟;1_1小时")
+    @XText("日期格式化类型:0_15分钟;1_1小时;2_30分钟")
     @TableField(exist = false)
     private Integer formatType;
 }

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

@@ -92,7 +92,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
     }
 
     @Override
-    public XListResult<DynamicQueryPlantPredictedPowerOutput> queryAveragePowerHalfHour(XContext context, DynamicQueryPlantPredictedPowerInput input) {
+    public XListResult<DynamicQueryPlantPredictedPowerOutput> queryAveragePower(XContext context, DynamicQueryPlantPredictedPowerInput input) {
         List<String> plantIds = input.getPlantIds();
         String startTime = input.getStartTime();
         String endTime = input.getEndTime();
@@ -106,6 +106,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                             .plantIds(plantIds)
                             .startTime(startTime)
                             .endTime(endTime)
+                            .formatType(input.getFormatType())
                             .build());
                     break;
                 case 1:
@@ -113,6 +114,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                             .plantIds(plantIds)
                             .startTime(startTime)
                             .endTime(endTime)
+                            .formatType(input.getFormatType())
                             .build());
                     break;
                 default:

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

@@ -160,13 +160,22 @@
         (
         SELECT
         predict_power,
-        DATE_FORMAT ( CASE
+        DATE_FORMAT (
+        <choose>
+            <when test="formatType == 0">
+                data_date
+            </when>
+            <otherwise>
+                CASE
                 MINUTE ( data_date )
                 WHEN 15 THEN
                 DATE_SUB( data_date, INTERVAL 15 MINUTE )
                 WHEN 45 THEN
                 DATE_SUB( data_date, INTERVAL 15 MINUTE ) ELSE data_date
-        END, '%H:%i:%s' ) AS create_time
+                END
+            </otherwise>
+        </choose>
+        , '%H:%i:%s' ) AS create_time
         FROM
         plant_predicted_power_mid_term
         WHERE
@@ -195,13 +204,22 @@
         (
         SELECT
         predict_power,
-        DATE_FORMAT ( CASE
+        DATE_FORMAT (
+        <choose>
+            <when test="formatType == 0">
+                data_date
+            </when>
+            <otherwise>
+                CASE
                 MINUTE ( data_date )
                 WHEN 15 THEN
                 DATE_SUB( data_date, INTERVAL 15 MINUTE )
                 WHEN 45 THEN
                 DATE_SUB( data_date, INTERVAL 15 MINUTE ) ELSE data_date
-        END, '%H:%i:%s' ) AS create_time
+                END
+            </otherwise>
+        </choose>
+        , '%H:%i:%s' ) AS create_time
         FROM
         plant_predicted_power_short_term
         WHERE