feat(吉林演示): 松原

1.排查并修复各时段间开优化功能执行异常导致未执行间开优化问题;
2.排查并修复15天间开优化功能执行后,优化结果时间段展示错乱问题;
3.排查并修复光伏功率预测展示功能,实际功率未展示问题;
4.排查并修复天气数据获取服务,数据处理后入库缺少数据问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -42,4 +42,7 @@ public class DynamicQueryPlantPredictedPowerInput {
     @NotNull(message = "缺少日期类型")
     @XText("日期类型:0_长期;1_中短期")
     private Integer dateType;
+
+    @XText("日期格式化类型:0_15分钟;1_1小时")
+    private Integer formatType;
 }

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

@@ -50,4 +50,8 @@ public class PredictedPowerView {
     @XText("电站ID集合")
     @TableField(exist = false)
     private List<String> plantIds;
+
+    @XText("日期格式化类型:0_15分钟;1_1小时")
+    @TableField(exist = false)
+    private Integer formatType;
 }

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

@@ -57,6 +57,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
         String startTime = input.getStartTime();
         String endTime = input.getEndTime();
         Integer dateType = input.getDateType();
+        Integer formatType = input.getFormatType();
         List<PredictedPowerView> list = null;
         if (CollUtil.isNotEmpty(plantIds)) {
             PredictedPowerViewMapper mapper = context.getBean(PredictedPowerViewMapper.class);
@@ -66,6 +67,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                             .plantIds(plantIds)
                             .startTime(startTime)
                             .endTime(endTime)
+                            .formatType(formatType)
                             .build());
                     break;
                 case 1:
@@ -73,6 +75,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                             .plantIds(plantIds)
                             .startTime(startTime)
                             .endTime(endTime)
+                            .formatType(formatType)
                             .build());
                     break;
                 default:

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

@@ -16,7 +16,14 @@
         (
         SELECT
         predict_power,
-        DATE_FORMAT ( data_date, '%H:%i:%s' ) AS create_time
+        <choose>
+            <when test="formatType == 1">
+                DATE_FORMAT ( data_date, '%H:00:00' ) AS create_time
+            </when>
+            <otherwise>
+                DATE_FORMAT ( data_date, '%H:%i:%s' ) AS create_time
+            </otherwise>
+        </choose>
         FROM
         plant_predicted_power_mid_term
         WHERE
@@ -46,7 +53,14 @@
         (
         SELECT
         predict_power,
-        DATE_FORMAT ( data_date, '%H:%i:%s' ) AS create_time
+        <choose>
+            <when test="formatType == 1">
+                DATE_FORMAT ( data_date, '%H:00:00' ) AS create_time
+            </when>
+            <otherwise>
+                DATE_FORMAT ( data_date, '%H:%i:%s' ) AS create_time
+            </otherwise>
+        </choose>
         FROM
         plant_predicted_power_short_term
         WHERE