feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -100,7 +100,7 @@ public class ThirdWeatherDataView implements Serializable {
 
     @XText("风向角度（地面100米）[degree]")
     @TableField
-    private Integer wnd100m;
+    private BigDecimal wnd100m;
 
     @XText("风速（地面100米）[m/s]")
     @TableField

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

@@ -67,4 +67,16 @@ public class WindPredictionHistoryEnt implements Serializable {
     @XText("预测功率(kw)")
     @TableField
     private BigDecimal predictedPower;
+
+    @XText("风向角度（地面100米）[degree]")
+    @TableField
+    private BigDecimal wnd100m;
+
+    @XText("风速（地面100米）[m/s]")
+    @TableField
+    private BigDecimal wns100m;
+
+    @XText("风力等级（地面100米）")
+    @TableField
+    private Integer wnsGrd100m;
 }

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

@@ -69,4 +69,16 @@ public class WindPredictionHistoryView implements Serializable {
     @XText("预测功率(kw)")
     @TableField
     private BigDecimal predictedPower;
+
+    @XText("风向角度（地面100米）[degree]")
+    @TableField
+    private BigDecimal wnd100m;
+
+    @XText("风速（地面100米）[m/s]")
+    @TableField
+    private BigDecimal wns100m;
+
+    @XText("风力等级（地面100米）")
+    @TableField
+    private Integer wnsGrd100m;
 }

C09-base/pps-core-base/src/main/java/pps/core/base/excel/ThirdApiWeatherDataListener2.java

@@ -88,6 +88,9 @@ public class ThirdApiWeatherDataListener2 implements ReadListener<ThirdApiWeathe
                 historyView.setAirTemperature(data.getTem());
                 historyView.setHumidity(data.getRhu());
                 historyView.setPressure(data.getPrsQfe());
+                historyView.setWnd100m(data.getWnd100m());
+                historyView.setWns100m(data.getWns100m());
+                historyView.setWnsGrd100m(data.getWnsGrd100m());
                 WindPredictionFutureView futureView = new WindPredictionFutureView();
                 futureView.setStationId(stationId);
                 futureView.setDataTime(dateTime);

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

@@ -76,7 +76,7 @@ public class BaseLineService {
     }
 
     @XText("风资源历史数据配置导入2")
-    @XApiGet
+    @XApiGet(anonymous = true)
     public XServiceResult importWindPrediction3(XContext context) {
         String fileName = "D:\\工作\\尚博信\\数据智能事业部\\零碳\\演示\\吉林\\新需求\\20240919\\result 3\\result 3";
         List<File> files = FileUtil.loopFiles(fileName);

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/third_weather_data/ThirdApiWeatherExcelData.java

@@ -96,7 +96,7 @@ public class ThirdApiWeatherExcelData {
     @ExcelProperty(value = "wnd_100m")
     @XText("风向角度（地面100米）[degree]")
     @JSONField(name = "wnd_100m")
-    private Integer wnd100m;
+    private BigDecimal wnd100m;
 
     @ExcelProperty(value = "wns_100m")
     @XText("风速（地面100米）[m/s]")

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

@@ -21,7 +21,7 @@
         <result column="uvi" property="uvi" jdbcType="INTEGER"/>
         <result column="phs" property="phs" jdbcType="INTEGER"/>
         <result column="wep" property="wep" jdbcType="INTEGER"/>
-        <result column="wnd_100m" property="wnd100m" jdbcType="INTEGER"/>
+        <result column="wnd_100m" property="wnd100m" jdbcType="DECIMAL"/>
         <result column="wns_100m" property="wns100m" jdbcType="DECIMAL"/>
         <result column="wns_grd_100m" property="wnsGrd100m" jdbcType="INTEGER"/>
         <result column="update_time" property="updateTime" jdbcType="VARCHAR"/>

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

@@ -14,6 +14,9 @@
         <result column="actual_wind_speed" property="actualWindSpeed" jdbcType="DECIMAL"/>
         <result column="actual_power" property="actualPower" jdbcType="DECIMAL"/>
         <result column="predicted_power" property="predictedPower" jdbcType="DECIMAL"/>
+        <result column="wnd_100m" property="wnd100m" jdbcType="DECIMAL"/>
+        <result column="wns_100m" property="wns100m" jdbcType="DECIMAL"/>
+        <result column="wns_grd_100m" property="wnsGrd100m" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -28,7 +31,10 @@
     actual_wind_direction,
     actual_wind_speed,
     actual_power,
-    predicted_power
+    predicted_power,
+    wnd_100m,
+    wns_100m,
+    wns_grd_100m
     </sql>
     <select id="selectOne" parameterType="pps.core.base.entity.WindPredictionHistoryView" resultMap="BaseResultMap">
         select
@@ -54,7 +60,8 @@
 
     <insert id="batchInsert" parameterType="list">
         INSERT INTO wind_prediction_history (station_id, data_time, wind_direction, wind_speed, air_temperature,
-        humidity, pressure, actual_wind_direction, actual_wind_speed, actual_power, predicted_power) VALUES
+        humidity, pressure, actual_wind_direction, actual_wind_speed, actual_power, predicted_power, wnd_100m,
+        wns_100m, wns_grd_100m) VALUES
         <foreach collection="list" separator="," item="item">
             (
             #{item.stationId},
@@ -67,7 +74,10 @@
             #{item.actualWindDirection},
             #{item.actualWindSpeed},
             #{item.actualPower},
-            #{item.predictedPower}
+            #{item.predictedPower},
+            #{item.wnd100m},
+            #{item.wns100m},
+            #{item.wnsGrd100m}
             )
         </foreach>
     </insert>