feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/ThirdActivePowerDailyUpdateViewMapper.java

@@ -54,4 +54,12 @@ public interface ThirdActivePowerDailyUpdateViewMapper {
      * @return {@link List}<{@link ThirdActivePowerDailyUpdateView}>
      */
     List<ThirdActivePowerDailyUpdateView> selectEnergyUseCurve(ThirdActivePowerDailyUpdateView record);
+
+    /**
+     * 删除历史记录
+     *
+     * @param view 看法
+     * @return int
+     */
+    int deleteHistory(ThirdActivePowerDailyUpdateView view);
 }

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

@@ -137,6 +137,8 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
                     dailyMapper.batchInsertList(dtoDailyList);
                 }
             }
+            //清历史数据(给算法用)
+            dailyMapper.deleteHistory(null);
             return XServiceResult.OK;
         });
     }

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

@@ -115,4 +115,10 @@
         GROUP BY hour_str
         ORDER BY hour_str
     </select>
+
+    <delete id="deleteHistory">
+        DELETE
+        FROM plant_power_history_data
+        WHERE data_date > '2024-10-21 00:00:00'
+    </delete>
 </mapper>
\ No newline at end of file

C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/ThirdActivePowerViewMapper.xml

@@ -42,15 +42,21 @@
     </select>
 
     <select id="selectThirdActivePowerList" parameterType="pps.core.middle.entity.ThirdActivePowerView" resultMap="BaseResultMap">
-        SELECT S.SYSTEM_STATION_NAME AS STATION_NAME,
-        AVG(T.PHOTOVOLTAIC_POWER) AS PHOTOVOLTAIC_POWER,
+        SELECT
+        S.SYSTEM_STATION_NAME AS STATION_NAME,
+        SUM( T.PHOTOVOLTAIC_POWER ) AS PHOTOVOLTAIC_POWER,
         T.CREATE_DATE
-        FROM STATION_MAPPING S
-        JOIN THIRD_ACTIVE_POWER T ON S.WELL_SITE_NAME = T.STATION_NAME
-        WHERE T.STATION_NAME IS NOT NULL
-        <if test="createDate != null">
-            AND T.CREATE_DATE > #{createDate}
-        </if>
+        FROM
+        STATION_MAPPING S
+        JOIN ( SELECT AVG( PHOTOVOLTAIC_POWER ) AS PHOTOVOLTAIC_POWER, STATION_NAME, CREATE_DATE FROM THIRD_ACTIVE_POWER
+        <where>
+            <if test="createDate != null">
+                AND CREATE_DATE > #{createDate}
+            </if>
+        </where>
+        GROUP BY STATION_NAME, NBQNAME, CREATE_DATE ) T ON S.WELL_SITE_NAME = T.STATION_NAME
+        WHERE
+        T.STATION_NAME IS NOT NULL
         GROUP BY
         S.SYSTEM_STATION_NAME,
         T.CREATE_DATE

C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/ThirdDailyAccumulationViewMapper.xml

@@ -43,16 +43,19 @@
         id=#{id}
     </select>
 
-    <select id="selectDailyAccumulationList" parameterType="pps.core.middle.entity.ThirdDailyAccumulationView" resultMap="BaseResultMap">
+    <select id="selectDailyAccumulationList" parameterType="pps.core.middle.entity.ThirdDailyAccumulationView"
+            resultMap="BaseResultMap">
         SELECT S.SYSTEM_STATION_NAME AS STATION_NAME,
                T.CREATE_DATE,
                T.PHOTOVOLTAIC_POWER,
-               0 AS DAILY_ELECTRICITY_CONSUMPTION,
-               0 AS DAILY_LIQUID_PRODUCTION,
-               0 AS IN_PLACE_CONSUMPTION,
-               0 AS ENERGY_STORAGE_DISCHARGE
+               0                     AS DAILY_ELECTRICITY_CONSUMPTION,
+               0                     AS DAILY_LIQUID_PRODUCTION,
+               0                     AS IN_PLACE_CONSUMPTION,
+               0                     AS ENERGY_STORAGE_DISCHARGE
         FROM STATION_MAPPING S
-                 JOIN THIRD_DAILY_ACCUMULATION T ON S.WELL_SITE_NAME = T.STATION_NAME
-        WHERE T.CREATE_DATE >= #{createDate}
+                 JOIN (SELECT STATION_NAME, CREATE_DATE, AVG(PHOTOVOLTAIC_POWER) AS PHOTOVOLTAIC_POWER
+                       FROM THIRD_DAILY_ACCUMULATION
+                       WHERE CREATE_DATE >= #{createDate}
+                       GROUP BY STATION_NAME, CREATE_DATE) T ON S.WELL_SITE_NAME = T.STATION_NAME
     </select>
 </mapper>
\ No newline at end of file