feat(吉林演示): 松原

1.修改天气数据抽取定时任务,解决部分历史数据丢失问题;
2.修改第三方风机电站真实数据定时任务,修改代码逻辑,解决时间未按照15分钟间隔推送问题;
3.修改第三方风机电站模拟数据定时任务,解决时间日期格式错误导致数据重复问题;
4.新建第三方风力发电数据(每日最新数据)表,同时生成对应代码,修改第三方风机电站模拟数据定时任务,增加每日最新数据更新逻辑;
5.修改风资源监控页面场站发电量统计接口,增加模拟数据查询逻辑,修改代码完成冒烟测试;
6.修改风资源监控页面历史风速接口,增加模拟数据查询逻辑,修改代码完成冒烟测试;
7.修改风资源监控页面历史风向接口,增加模拟数据查询逻辑,修改代码完成冒烟测试;
8.修改模拟数据历史表和每日最新数据表,增加发电量字段,同时修改对应代码增加字段并修改模拟数据生成定时任务,增加生成发电量逻辑并添加插入历史表和最新数据表逻辑;
9.修改风资源监控页面风电站运行状态接口,增加模拟数据查询逻辑,修改代码完成冒烟测试;
10.修改风资源监控页面发电功率列表接口,增加模拟数据查询逻辑,修改代码完成冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/ThirdWindPowerGenerationUpdateViewMapper.xml

@@ -83,43 +83,43 @@
     </resultMap>
 
     <select id="stationPowerGeneration" resultMap="ExtResultMap">
-        SELECT IFNULL(SUM(actual_power), 0) AS today_power,
-        (SELECT IFNULL(SUM(actual_power), 0)
+        SELECT IFNULL(SUM(actual_generation), 0) AS today_power,
+        (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
         WHERE collect_time BETWEEN #{dateList[2]} AND #{dateList[3]} AND station_name IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         ) AS month_power,
-        (SELECT IFNULL(SUM(actual_power), 0)
+        (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
         WHERE collect_time BETWEEN #{dateList[4]} AND #{dateList[5]} AND station_name IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         ) AS last_month_power,
-        (SELECT IFNULL(SUM(actual_power), 0)
+        (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
         WHERE collect_time BETWEEN #{dateList[6]} AND #{dateList[7]} AND station_name IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         ) AS season_power,
-        (SELECT IFNULL(SUM(actual_power), 0)
+        (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
         WHERE collect_time BETWEEN #{dateList[8]} AND #{dateList[9]} AND station_name IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         ) AS last_season_power,
-        (SELECT IFNULL(SUM(actual_power), 0)
+        (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
         WHERE collect_time BETWEEN #{dateList[10]} AND #{dateList[11]} AND station_name IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         ) AS year_power,
-        (SELECT IFNULL(SUM(actual_power), 0)
+        (SELECT IFNULL(SUM(actual_generation), 0)
         FROM third_wind_power_generation_update
         WHERE collect_time BETWEEN #{dateList[12]} AND #{dateList[13]} AND station_name IN
         <foreach collection="list" item="item" open="(" separator="," close=")">