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/ThirdWindPowerGenerationCloudServiceImpl.java

@@ -9,7 +9,6 @@ import pps.core.base.entity.ThirdWindPowerGenerationView;
 import pps.core.base.mapper.ThirdWindPowerGenerationUpdateViewMapper;
 import pps.core.base.mapper.ThirdWindPowerGenerationViewMapper;
 import pps.core.base.utils.ServiceUtil;
-import pps.core.common.constant.BusinessConstant;
 import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
@@ -56,10 +55,6 @@ public class ThirdWindPowerGenerationCloudServiceImpl implements IThirdWindPower
                 view.setInputTime(endTime);
                 copy = this.newThirdWindPowerGenerationView(view);
                 batchList.add(copy);
-                //计算原始数据
-                view.setActualWindSpeed(view.getActualWindSpeed().multiply(BusinessConstant.BIG_DECIMAL_0_6));
-                view.setActualPower(view.getActualPower().multiply(BusinessConstant.BIG_DECIMAL_0_6));
-                view.setActualGeneration(view.getActualGeneration().multiply(BusinessConstant.BIG_DECIMAL_0_6));
                 batchList.add(view);
                 //每日最新数据
                 batchUpdateList.add(XCopyUtils.copyNewObject(view, ThirdWindPowerGenerationUpdateView.class));
@@ -101,9 +96,9 @@ public class ThirdWindPowerGenerationCloudServiceImpl implements IThirdWindPower
                 .stationName(view.getStationName())
                 .stationId(view.getStationId())
                 .collectTime(DateUtil.offsetMinute(view.getCollectTime(), -15))
-                .actualWindSpeed(view.getActualWindSpeed().multiply(BusinessConstant.BIG_DECIMAL_0_4))
-                .actualPower(view.getActualPower().multiply(BusinessConstant.BIG_DECIMAL_0_4))
-                .actualGeneration(view.getActualGeneration().multiply(BusinessConstant.BIG_DECIMAL_0_4))
+                .actualWindSpeed(view.getActualWindSpeed())
+                .actualPower(view.getActualPower())
+                .actualGeneration(view.getActualGeneration())
                 .actualWindDirection(view.getActualWindDirection())
                 .inputTime(view.getInputTime())
                 .systemSource(view.getSystemSource())

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

@@ -46,7 +46,7 @@
         WITH wind_prediction AS (SELECT t.station_name               AS station_name,
                                         f.station_id                 AS station_id,
                                         f.data_time                  AS collect_time,
-                                        ROUND(f.wind_speed * 0.9, 2) AS actual_wind_speed,
+                                        ROUND(f.wind_speed * 0.45, 2) AS actual_wind_speed,
                                         f.predicted_power            AS actual_power,
                                         f.wind_direction             AS actual_wind_direction,
                                         ROW_NUMBER()                    OVER ( PARTITION BY f.station_id ORDER BY f.data_time DESC ) AS rn