feat(吉林演示): 松原

1.天气数据接收定时任务,解决代码扫描问题,修改文件读取相关代码,解决资源未关流问题;
2.修改登录验证码生成工具类,解决代码扫描问题,修复随机数不安全问题;
3.删除除主程序启动类外其他启动类模块,解决代码扫描问题;
4.删除自定义httputlis类,解决代码扫描问题,替换部分代码远程调用方法;
5.重构光伏预测模块下载电站实际发电数据导入模板接口,解决代码扫描问题;
6.重构光伏预测模块导入电站实际发电数据接口,解决代码扫描问题;
7.删除公用excel导入导出工具类及poi相关pom依赖,解决代码扫描问题;
8.光伏功率预测模块,增加查询线路列表接口,解决页面接口报错问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -49,7 +49,11 @@ public class ThirdWindPowerGenerationEnt implements Serializable {
     @TableField
     private BigDecimal actualGeneration;
 
-    @XText("实际风向")
+    @XText("精确风向(实际)")
+    @TableField
+    private BigDecimal accurateWindDirection;
+
+    @XText("实际风向(用精确风向转换)")
     @TableField
     private Integer actualWindDirection;
 

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

@@ -48,7 +48,11 @@ public class ThirdWindPowerGenerationUpdateEnt implements Serializable {
     @TableField
     private BigDecimal actualGeneration;
 
-    @XText("实际风向")
+    @XText("精确风向(实际)")
+    @TableField
+    private BigDecimal accurateWindDirection;
+
+    @XText("实际风向(用精确风向转换)")
     @TableField
     private Integer actualWindDirection;
 

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

@@ -44,7 +44,11 @@ public class ThirdWindPowerGenerationUpdateView implements Serializable {
     @TableField
     private BigDecimal actualGeneration;
 
-    @XText("实际风向")
+    @XText("精确风向(实际)")
+    @TableField
+    private BigDecimal accurateWindDirection;
+
+    @XText("实际风向(用精确风向转换)")
     @TableField
     private Integer actualWindDirection;
 

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

@@ -51,7 +51,11 @@ public class ThirdWindPowerGenerationView implements Serializable {
     @TableField
     private BigDecimal actualGeneration;
 
-    @XText("实际风向")
+    @XText("精确风向(实际)")
+    @TableField
+    private BigDecimal accurateWindDirection;
+
+    @XText("实际风向(用精确风向转换)")
     @TableField
     private Integer actualWindDirection;
 

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

@@ -54,7 +54,7 @@ public class WindPredictionHistoryEnt implements Serializable {
 
     @XText("实际风向")
     @TableField
-    private Integer actualWindDirection;
+    private BigDecimal actualWindDirection;
 
     @XText("实际风速(m/s)")
     @TableField

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

@@ -56,7 +56,7 @@ public class WindPredictionHistoryView implements Serializable {
 
     @XText("实际风向")
     @TableField
-    private Integer actualWindDirection;
+    private BigDecimal actualWindDirection;
 
     @XText("实际风速(m/s)")
     @TableField

C09-base/pps-core-base/src/main/java/pps/core/base/service/WindPredictionHistoryCloudServiceImpl.java

@@ -125,13 +125,13 @@ public class WindPredictionHistoryCloudServiceImpl implements IWindPredictionHis
                     ent = map.get(future.getDataTime());
                     view.setActualPower(ent.getActualPower());
                     view.setActualWindSpeed(ent.getActualWindSpeed());
-                    view.setActualWindDirection(ent.getActualWindDirection());
+                    view.setActualWindDirection(ent.getAccurateWindDirection());
                 }
             }
             if (flag) {
                 view.setActualPower(BigDecimal.ZERO);
                 view.setActualWindSpeed(BigDecimal.ZERO);
-                view.setActualWindDirection(360);
+                view.setActualWindDirection(BigDecimal.ZERO);
             }
             historyList.add(view);
         }

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

@@ -9,6 +9,7 @@
         <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="accurate_wind_direction" property="accurateWindDirection" 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"/>
@@ -22,6 +23,7 @@
     actual_wind_speed,
     actual_power,
     actual_generation,
+    accurate_wind_direction,
     actual_wind_direction,
     input_time,
     system_source
@@ -71,7 +73,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_generation, actual_wind_direction, input_time, system_source) VALUES
+        actual_power, actual_generation, accurate_wind_direction, actual_wind_direction, input_time, system_source) VALUES
         <foreach collection="list" separator="," item="item">
             (
             #{item.stationName},
@@ -80,6 +82,7 @@
             #{item.actualWindSpeed},
             #{item.actualPower},
             #{item.actualGeneration},
+            #{item.accurateWindDirection},
             #{item.actualWindDirection},
             #{item.inputTime},
             #{item.systemSource}

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

@@ -9,6 +9,7 @@
         <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="accurate_wind_direction" property="accurateWindDirection" 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"/>
@@ -49,6 +50,7 @@
                                         ROUND(f.wind_speed * 0.9, 2) AS actual_wind_speed,
                                         f.predicted_power            AS actual_power,
                                         f.wind_direction             AS actual_wind_direction,
+                                        f.wind_direction             AS accurate_wind_direction,
                                         ROW_NUMBER()                    OVER ( PARTITION BY f.station_id ORDER BY f.data_time DESC ) AS rn
                                  FROM base_wind_turbine t
                                           LEFT JOIN wind_prediction_future f ON t.id = f.station_id
@@ -61,14 +63,16 @@
                actual_wind_speed,
                ROUND(actual_wind_speed * 0.85 * 250, 2) AS actual_power,
                ROUND(actual_wind_speed * 0.85 * 500, 2) AS actual_generation,
-               actual_wind_direction
+               actual_wind_direction,
+               accurate_wind_direction
         FROM wind_prediction
         WHERE rn = 1
     </select>
 
     <insert id="batchInsert" parameterType="list">
         INSERT INTO third_wind_power_generation (station_name, station_id, collect_time, actual_wind_speed,
-        actual_power, actual_generation, actual_wind_direction, input_time, system_source) VALUES
+        actual_power, actual_generation, accurate_wind_direction, actual_wind_direction, input_time, system_source)
+        VALUES
         <foreach collection="list" separator="," item="item">
             (
             #{item.stationName},
@@ -77,6 +81,7 @@
             #{item.actualWindSpeed},
             #{item.actualPower},
             #{item.actualGeneration},
+            #{item.accurateWindDirection},
             #{item.actualWindDirection},
             #{item.inputTime},
             #{item.systemSource}