feat(吉林演示): 松原

1.修改风电站运行状态接口,增加模拟实际发电功率处理逻辑,完成接口冒烟测试;
2.修改天气数据处理定时任务,解决晚上十一点半天气预报数据处理异常问题,修改风资源预测数据和光伏资源预测数据时间处理逻辑,完成接口冒烟测试;
3.修改风机预测数据模块相关功能接口,增加判断当前部署环境逻辑,解决查询全量数据问题;
4.修改风机预测数据生成模块第三方风力发电数据生成功能,增加数据拆分逻辑,区分15分数据层级,完成功能冒烟测试;
5.修改风机预测监控页面历史风速统计接口,统计数据不显示问题及小数位过多问题;
6.修改天气预报数据爬取定时任务,解决8:00-11:00期间没有数据问题,完成功能验证;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -495,13 +495,13 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
                     WeatherBureauDataView view = WeatherBureauDataView.builder()
                             .dataTime(parse)
                             .weatherIcon(dailyData.getWeatherArray().get(i))
-                            .airTemperature(new BigDecimal(CharSequenceUtil.replace(dailyData.getTemperatureArray().get(i), "℃", "")))
+                            .airTemperature(this.stringToBigDecimal(dailyData.getTemperatureArray(), i, "℃"))
                             .precipitation(dailyData.getPrecipitationArray().get(i))
-                            .windSpeed(new BigDecimal(CharSequenceUtil.replace(dailyData.getWindSpeedArray().get(i), "m/s", "")))
+                            .windSpeed(this.stringToBigDecimal(dailyData.getWindSpeedArray(), i, "m/s"))
                             .windDirection(this.getWindDirection(dailyData.getWindDirectionArray(), i))
-                            .pressure(new BigDecimal(CharSequenceUtil.replace(dailyData.getPressureArray().get(i), "hPa", "")))
-                            .humidity(new BigDecimal(CharSequenceUtil.replace(dailyData.getHumidityArray().get(i), "%", "")))
-                            .cloudCover(new BigDecimal(CharSequenceUtil.replace(dailyData.getCloudCoverArray().get(i), "%", "")))
+                            .pressure(this.stringToBigDecimal(dailyData.getPressureArray(), i, "hPa"))
+                            .humidity(this.stringToBigDecimal(dailyData.getHumidityArray(), i, "%"))
+                            .cloudCover(this.stringToBigDecimal(dailyData.getCloudCoverArray(), i, "%"))
                             .areaCode(cityCode)
                             .build();
                     //去重
@@ -701,10 +701,10 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
                                 .stationId(plantId)
                                 .dataTime(parse)
                                 .windDirection(this.getWindDirection(dailyData.getWindDirectionArray(), i))
-                                .windSpeed(new BigDecimal(CharSequenceUtil.replace(dailyData.getWindSpeedArray().get(i), "m/s", "")))
-                                .airTemperature(new BigDecimal(CharSequenceUtil.replace(dailyData.getTemperatureArray().get(i), "℃", "")))
-                                .humidity(new BigDecimal(CharSequenceUtil.replace(dailyData.getHumidityArray().get(i), "%", "")))
-                                .pressure(new BigDecimal(CharSequenceUtil.replace(dailyData.getPressureArray().get(i), "hPa", "")))
+                                .windSpeed(this.stringToBigDecimal(dailyData.getWindSpeedArray(), i, "m/s"))
+                                .airTemperature(this.stringToBigDecimal(dailyData.getTemperatureArray(), i, "℃"))
+                                .humidity(this.stringToBigDecimal(dailyData.getHumidityArray(), i, "%"))
+                                .pressure(this.stringToBigDecimal(dailyData.getPressureArray(), i, "hPa"))
                                 .build();
                         // 5.执行SQL
                         allList.add(dao);
@@ -880,11 +880,11 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
                         }
                         PlantPredictedPowerDataEnt dao = this.getPlantPredictedPowerEnt(plantId,
                                 this.int2Str(hour),
-                                new BigDecimal(CharSequenceUtil.replace(dailyData.getTemperatureArray().get(i), "℃", "")),
-                                new BigDecimal(CharSequenceUtil.replace(dailyData.getWindSpeedArray().get(i), "m/s", "")),
+                                this.stringToBigDecimal(dailyData.getTemperatureArray(), i, "℃"),
+                                this.stringToBigDecimal(dailyData.getWindSpeedArray(), i, "m/s"),
                                 new BigDecimal(this.getWindDirection(dailyData.getWindDirectionArray(), i)),
-                                new BigDecimal(CharSequenceUtil.replace(dailyData.getPressureArray().get(i), "hPa", "")),
-                                new BigDecimal(CharSequenceUtil.replace(dailyData.getHumidityArray().get(i), "%", "")),
+                                this.stringToBigDecimal(dailyData.getPressureArray(), i, "hPa"),
+                                this.stringToBigDecimal(dailyData.getHumidityArray(), i, "%"),
                                 String.valueOf(parse.year()),
                                 this.int2Str(parse.monthBaseOne()),
                                 this.int2Str(parse.dayOfMonth())
@@ -1083,4 +1083,22 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
         }
         return wind;
     }
+
+    /**
+     * 字符串转换为BigDecimal
+     *
+     * @param stringList 字符串列表
+     * @param i          我
+     * @param replaceStr 替换str
+     * @return {@link BigDecimal }
+     */
+    private BigDecimal stringToBigDecimal(List<String> stringList, int i, String replaceStr) {
+        BigDecimal result;
+        if (CollUtil.isNotEmpty(stringList) && i < stringList.size() && CharSequenceUtil.isNotBlank(stringList.get(i))) {
+            result = new BigDecimal(CharSequenceUtil.replace(stringList.get(i), replaceStr, ""));
+        } else {
+            result = BigDecimal.ZERO;
+        }
+        return result;
+    }
 }
\ No newline at end of file