feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -49,20 +49,22 @@
         FROM
         (
         SELECT
-        p.station_name,
+        l.line_name AS station_name,
         CASE
         WHEN MINUTE ( t.data_date ) < 31 THEN
         DATE_FORMAT( t.data_date, '%H:00:00' ) ELSE DATE_FORMAT( t.data_date, '%H:30:00' )
         END data_date,
         t.predict_power
         FROM
-        base_photovoltaic_plant p
+        base_power_line l
+        JOIN base_power_line_plant e ON l.id = e.line_id
+        JOIN base_photovoltaic_plant p ON p.id = e.plant_id
         JOIN plant_predicted_power_short_term t ON p.id = t.plant_id
         WHERE
-        data_date BETWEEN #{startTime}
+        t.data_date BETWEEN #{startTime}
         AND #{endTime}
         <if test="stationNames != null and stationNames.size() > 0">
-            AND p.station_name IN
+            AND l.line_name IN
             <foreach collection="stationNames" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>

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

@@ -202,25 +202,28 @@
         SELECT z.station_name,
         z.create_date,
         MAX(z.photovoltaic_power) AS photovoltaic_power
-        FROM (SELECT station_name,
+        FROM (SELECT l.line_name AS station_name,
         CASE
-        WHEN MINUTE ( create_date) < 31 THEN
-        DATE_FORMAT( create_date, '%H:00:00' ) ELSE DATE_FORMAT( create_date, '%H:30:00' )
+        WHEN MINUTE ( t.create_date) < 31 THEN
+        DATE_FORMAT( t.create_date, '%H:00:00' ) ELSE DATE_FORMAT( t.create_date, '%H:30:00' )
         END create_date ,
-        photovoltaic_power
+        t.photovoltaic_power
         FROM
-        third_active_power
+        base_power_line l
+        JOIN base_power_line_plant e ON l.id = e.line_id
+        JOIN base_photovoltaic_plant p ON p.id = e.plant_id
+        JOIN third_active_power t ON p.station_name = t.station_name
         WHERE
-        create_date BETWEEN #{startTime}
+        t.create_date BETWEEN #{startTime}
         AND #{endTime}
         <if test="systemSource != null">
-            AND system_source = #{systemSource}
+            AND t.system_source = #{systemSource}
         </if>
         <if test="stationName != null and stationName != ''">
-            AND station_name = #{stationName}
+            AND t.station_name = #{stationName}
         </if>
         <if test="stationNames != null and stationNames.size() > 0">
-            AND station_name IN
+            AND l.line_name IN
             <foreach collection="stationNames" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>