feat(吉林演示): 松原

1.排查并修复各时段间开优化功能执行异常导致未执行间开优化问题;
2.排查并修复15天间开优化功能执行后,优化结果时间段展示错乱问题;
3.排查并修复光伏功率预测展示功能,实际功率未展示问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -156,13 +156,27 @@
         SELECT IFNULL(AVG(z.photovoltaic_power), 0) AS photovoltaic_power,
         z.input_time
         FROM (SELECT photovoltaic_power,
-        CASE
-
-        WHEN MINUTE ( input_time) IN ( 10, 40 ) THEN
-        DATE_SUB( input_time, INTERVAL + 10 MINUTE )
-        WHEN MINUTE ( input_time ) IN ( 20, 50 ) THEN
-        DATE_SUB( input_time, INTERVAL + 5 MINUTE ) ELSE input_time
-        END input_time
+        <choose>
+            <when test="systemSource == 'SY'">
+                CASE
+                WHEN MINUTE ( create_date ) &lt; 15 THEN
+                DATE_FORMAT( create_date, '%Y-%m-%d %H:00:00' )
+                WHEN MINUTE ( create_date ) &lt; 30 THEN
+                DATE_FORMAT( create_date, '%Y-%m-%d %H:15:00' )
+                WHEN MINUTE ( create_date ) &lt; 45 THEN
+                DATE_FORMAT( create_date, '%Y-%m-%d %H:30:00' )
+                ELSE DATE_FORMAT( create_date, '%Y-%m-%d %H:45:00' )
+                END input_time
+            </when>
+            <otherwise>
+                CASE
+                WHEN MINUTE ( input_time) IN ( 10, 40 ) THEN
+                DATE_SUB( input_time, INTERVAL + 10 MINUTE )
+                WHEN MINUTE ( input_time ) IN ( 20, 50 ) THEN
+                DATE_SUB( input_time, INTERVAL + 5 MINUTE ) ELSE input_time
+                END input_time
+            </otherwise>
+        </choose>
         FROM
         third_active_power
         WHERE