feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/entity/ThirdWindPowerGenerationEnt.java

@@ -45,6 +45,10 @@ public class ThirdWindPowerGenerationEnt implements Serializable {
     @TableField
     private BigDecimal actualPower;
 
+    @XText("实际发电量(kw)")
+    @TableField
+    private BigDecimal actualGeneration;
+
     @XText("实际风向")
     @TableField
     private Integer actualWindDirection;

C09-base/pps-core-base/src/main/java/pps/core/base/entity/ThirdWindPowerGenerationUpdateEnt.java

@@ -44,6 +44,10 @@ public class ThirdWindPowerGenerationUpdateEnt implements Serializable {
     @TableField
     private BigDecimal actualPower;
 
+    @XText("实际发电量(kw)")
+    @TableField
+    private BigDecimal actualGeneration;
+
     @XText("实际风向")
     @TableField
     private Integer actualWindDirection;

C09-base/pps-core-base/src/main/java/pps/core/base/entity/ThirdWindPowerGenerationUpdateView.java

@@ -40,6 +40,10 @@ public class ThirdWindPowerGenerationUpdateView implements Serializable {
     @TableField
     private BigDecimal actualPower;
 
+    @XText("实际发电量(kw)")
+    @TableField
+    private BigDecimal actualGeneration;
+
     @XText("实际风向")
     @TableField
     private Integer actualWindDirection;

C09-base/pps-core-base/src/main/java/pps/core/base/entity/ThirdWindPowerGenerationView.java

@@ -47,6 +47,10 @@ public class ThirdWindPowerGenerationView implements Serializable {
     @TableField
     private BigDecimal actualPower;
 
+    @XText("实际发电量(kw)")
+    @TableField
+    private BigDecimal actualGeneration;
+
     @XText("实际风向")
     @TableField
     private Integer actualWindDirection;

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

@@ -8,6 +8,7 @@
         <result column="collect_time" property="collectTime" jdbcType="VARCHAR"/>
         <result column="actual_wind_speed" property="actualWindSpeed" jdbcType="DECIMAL"/>
         <result column="actual_power" property="actualPower" jdbcType="DECIMAL"/>
+        <result column="actual_generation" property="actualGeneration" jdbcType="DECIMAL"/>
         <result column="actual_wind_direction" property="actualWindDirection" jdbcType="INTEGER"/>
         <result column="input_time" property="inputTime" jdbcType="VARCHAR"/>
         <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
@@ -20,6 +21,7 @@
     collect_time,
     actual_wind_speed,
     actual_power,
+    actual_generation,
     actual_wind_direction,
     input_time,
     system_source
@@ -43,7 +45,7 @@
 
     <insert id="batchInsert" parameterType="list">
         INSERT INTO third_wind_power_generation_update (station_name, station_id, collect_time, actual_wind_speed,
-        actual_power, actual_wind_direction, input_time, system_source) VALUES
+        actual_power, actual_generation, actual_wind_direction, input_time, system_source) VALUES
         <foreach collection="list" separator="," item="item">
             (
             #{item.stationName},
@@ -51,6 +53,7 @@
             #{item.collectTime},
             #{item.actualWindSpeed},
             #{item.actualPower},
+            #{item.actualGeneration},
             #{item.actualWindDirection},
             #{item.inputTime},
             #{item.systemSource}

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

@@ -8,6 +8,7 @@
         <result column="collect_time" property="collectTime" jdbcType="VARCHAR"/>
         <result column="actual_wind_speed" property="actualWindSpeed" jdbcType="DECIMAL"/>
         <result column="actual_power" property="actualPower" jdbcType="DECIMAL"/>
+        <result column="actual_generation" property="actualGeneration" jdbcType="DECIMAL"/>
         <result column="actual_wind_direction" property="actualWindDirection" jdbcType="INTEGER"/>
         <result column="input_time" property="inputTime" jdbcType="VARCHAR"/>
         <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
@@ -20,6 +21,7 @@
     collect_time,
     actual_wind_speed,
     actual_power,
+    actual_generation,
     actual_wind_direction,
     input_time,
     system_source
@@ -57,7 +59,8 @@
                station_id,
                collect_time,
                actual_wind_speed,
-               ROUND(actual_wind_speed * RAND() * 1000, 2) AS actual_power,
+               ROUND(actual_wind_speed * RAND() * 500, 2)  AS actual_power,
+               ROUND(actual_wind_speed * RAND() * 1000, 2) AS actualGeneration,
                actual_wind_direction
         FROM wind_prediction
         WHERE rn = 1
@@ -65,7 +68,7 @@
 
     <insert id="batchInsert" parameterType="list">
         INSERT INTO third_wind_power_generation (station_name, station_id, collect_time, actual_wind_speed,
-        actual_power, actual_wind_direction, input_time, system_source) VALUES
+        actual_power, actual_generation, actual_wind_direction, input_time, system_source) VALUES
         <foreach collection="list" separator="," item="item">
             (
             #{item.stationName},
@@ -73,6 +76,7 @@
             #{item.collectTime},
             #{item.actualWindSpeed},
             #{item.actualPower},
+            #{item.actualGeneration},
             #{item.actualWindDirection},
             #{item.inputTime},
             #{item.systemSource}