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

@@ -480,34 +480,25 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
             //删除数据
             deleteList.add(cityCode);
             //遍历预测数据列表
-            int hours = 0;
+            int flag = 0;
             DateTime dateTime;
             for (DailyData dailyData : dailyDataList) {
                 dateTime = DateUtil.date(dailyData.getDateTime());
                 for (int i = 0; i < 8; i++) {
-                    //判断小时数与查到的小时数，如果查到的小时数小，判断为第二天
-                    int hour = DateUtil.parse(dailyData.getHourTimeArray().get(i), BusinessConstant.MINUTES_FORMAT).hour(true);
-                    if (hours >= hour) {
+                    int hour = LocalTime.parse(dailyData.getHourTimeArray().get(i)).getHour();
+                    DateTime parse = DateUtil.parse(DateUtil.formatDate(dateTime) + ' ' + this.int2Str(hour) + ':' + BusinessConstant.START_OF_DAY_TIME);
+                    if (DateUtil.compare(parse, dateTime) < 0 && flag == 0) {
+                        parse = DateUtil.offsetDay(parse, 1);
                         dateTime = DateUtil.offsetDay(dateTime, 1);
-                    }
-                    hours = hour;
-                    //风向
-                    int wind = 0;
-                    if (CollUtil.isNotEmpty(dailyData.getWindDirectionArray())) {
-                        if (i < dailyData.getWindDirectionArray().size()) {
-                            WindDirection windDirection = WindDirection.findByValue(dailyData.getWindDirectionArray().get(i));
-                            if (Objects.nonNull(windDirection)) {
-                                wind = windDirection.getValue();
-                            }
-                        }
+                        flag++;
                     }
                     WeatherBureauDataView view = WeatherBureauDataView.builder()
-                            .dataTime(DateUtil.parse(dateTime.toString(BusinessConstant.DATE_FORMAT_DAY) + ' ' + this.int2Str(hours) + ':' + BusinessConstant.START_OF_DAY_TIME))
+                            .dataTime(parse)
                             .weatherIcon(dailyData.getWeatherArray().get(i))
                             .airTemperature(new BigDecimal(CharSequenceUtil.replace(dailyData.getTemperatureArray().get(i), "℃", "")))
                             .precipitation(dailyData.getPrecipitationArray().get(i))
                             .windSpeed(new BigDecimal(CharSequenceUtil.replace(dailyData.getWindSpeedArray().get(i), "m/s", "")))
-                            .windDirection(wind)
+                            .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), "%", "")))