feat(吉林演示): 松原

1.修改风资源监控页面历史风向统计接口,解决只能统计出一种风向问题,完成接口冒烟测试;
2.修改风资源监控页面风电站运行状态接口,解决没有启动状态时无法查询数据问题,完成接口冒烟测试;
3.修改风资源监控页面发电功率预测接口,增加使用模拟数据生成风电实际功率,完成接口冒烟测试;
4.修改风资源历史数据处理定时任务,增加模拟真实数据匹配逻辑,完成冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -30,10 +30,10 @@ public class BaseLineService {
     public XServiceResult test(XContext context) {
 //        BaseWeatherCloudServiceImpl bean = context.getBean(BaseWeatherCloudServiceImpl.class);
 //        bean.weatherDataProcess(context, "CQ");
-//        WindPredictionHistoryCloudServiceImpl bean = context.getBean(WindPredictionHistoryCloudServiceImpl.class);
-//        bean.windPredictionHistoryJob(context);
-        ThirdWindPowerGenerationCloudServiceImpl bean = context.getBean(ThirdWindPowerGenerationCloudServiceImpl.class);
-        bean.thirdWindPowerGenerationJob(context);
+        WindPredictionHistoryCloudServiceImpl bean = context.getBean(WindPredictionHistoryCloudServiceImpl.class);
+        bean.windPredictionHistoryJob(context);
+//        ThirdWindPowerGenerationCloudServiceImpl bean = context.getBean(ThirdWindPowerGenerationCloudServiceImpl.class);
+//        bean.thirdWindPowerGenerationJob(context);
         return XServiceResult.OK;
     }
 

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

@@ -4,9 +4,12 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.cloud.base.service.IWindPredictionHistoryCloudService;
+import pps.core.base.entity.ThirdWindPowerGenerationEnt;
 import pps.core.base.entity.WindPredictionFutureEnt;
 import pps.core.base.entity.WindPredictionHistoryView;
+import pps.core.base.mapper.ThirdWindPowerGenerationMapper;
 import pps.core.base.mapper.WindPredictionFutureMapper;
 import pps.core.base.mapper.WindPredictionHistoryViewMapper;
 import pps.core.common.utils.BaseUtils;
@@ -14,8 +17,10 @@ import xstartup.annotation.XService;
 import xstartup.base.XContext;
 import xstartup.data.XServiceResult;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 风资源训练集数据Cloud模块
@@ -42,11 +47,29 @@ public class WindPredictionHistoryCloudServiceImpl implements IWindPredictionHis
                 .between(WindPredictionFutureEnt::getDataTime, startTime, endTime)
         );
         if (CollUtil.isNotEmpty(list)) {
-            WindPredictionHistoryViewMapper viewMapper = context.getBean(WindPredictionHistoryViewMapper.class);
+            //查实际发电数据
+            ThirdWindPowerGenerationMapper generationMapper = context.getBean(ThirdWindPowerGenerationMapper.class);
+            List<ThirdWindPowerGenerationEnt> generationList = generationMapper.selectList(new QueryWrapper<ThirdWindPowerGenerationEnt>()
+                    .select("station_id", "collect_time", "MAX( actual_power ) AS actual_power",
+                            "MAX( actual_generation ) AS actual_generation", "MAX( actual_wind_speed ) AS actual_wind_speed",
+                            "MAX( actual_wind_direction ) AS actual_wind_direction")
+                    .lambda()
+                    .between(ThirdWindPowerGenerationEnt::getCollectTime, startTime, endTime)
+                    .groupBy(ThirdWindPowerGenerationEnt::getStationId, ThirdWindPowerGenerationEnt::getCollectTime)
+            );
+            Map<String, Map<Date, ThirdWindPowerGenerationEnt>> collect;
+            if (CollUtil.isEmpty(generationList)) {
+                collect = Collections.emptyMap();
+            } else {
+                collect = generationList.stream()
+                        .collect(Collectors.groupingBy(ThirdWindPowerGenerationEnt::getStationId, Collectors.toMap(ThirdWindPowerGenerationEnt::getCollectTime, Function.identity())));
+            }
+            //数据处理
+            List<WindPredictionHistoryView> historyList = this.dataProcess(list, collect);
             //按时间范围删除数据
+            WindPredictionHistoryViewMapper viewMapper = context.getBean(WindPredictionHistoryViewMapper.class);
             viewMapper.deleteByTimeRange(startTime, endTime);
             //todo 数据处理,匹配实际发电量和实际风速
-            List<WindPredictionHistoryView> historyList = this.dataProcess(list);
             if (historyList.size() > BaseUtils.BATCH_SIZE) {
                 List<List<WindPredictionHistoryView>> subList = BaseUtils.getSubList(historyList);
                 subList.forEach(viewMapper::batchInsert);
@@ -64,24 +87,41 @@ public class WindPredictionHistoryCloudServiceImpl implements IWindPredictionHis
      * todo 后续增加匹配实际发电量和实际风速逻辑
      *
      * @param list    列表
+     * @param collect 收集
      * @return {@link List }<{@link WindPredictionHistoryView }>
      */
-    private List<WindPredictionHistoryView> dataProcess(List<WindPredictionFutureEnt> list) {
+    private List<WindPredictionHistoryView> dataProcess(List<WindPredictionFutureEnt> list, Map<String, Map<Date, ThirdWindPowerGenerationEnt>> collect) {
         List<WindPredictionHistoryView> historyList = new ArrayList<>(list.size());
+        Map<Date, ThirdWindPowerGenerationEnt> map;
+        ThirdWindPowerGenerationEnt ent;
         for (WindPredictionFutureEnt future : list) {
-            historyList.add(WindPredictionHistoryView.builder()
-                    .stationId(future.getStationId())
-                    .dataTime(future.getDataTime())
-                    .windDirection(future.getWindDirection())
-                    .windSpeed(future.getWindSpeed())
-                    .airTemperature(future.getAirTemperature())
-                    .humidity(future.getHumidity())
-                    .pressure(future.getPressure())
-                    .actualWindDirection(0)
-                    .actualWindSpeed(future.getActualWindSpeed())
-                    .actualPower(future.getActualPower())
-                    .predictedPower(future.getPredictedPower())
-                    .build());
+            WindPredictionHistoryView view = new WindPredictionHistoryView();
+            view.setStationId(future.getStationId());
+            view.setDataTime(future.getDataTime());
+            view.setWindDirection(future.getWindDirection());
+            view.setWindSpeed(future.getWindSpeed());
+            view.setAirTemperature(future.getAirTemperature());
+            view.setHumidity(future.getHumidity());
+            view.setPressure(future.getPressure());
+            view.setPredictedPower(future.getPredictedPower());
+            //匹配真实数据
+            boolean flag = true;
+            if (collect.containsKey(future.getStationId())) {
+                map = collect.get(future.getStationId());
+                if (map.containsKey(future.getDataTime())) {
+                    flag = false;
+                    ent = map.get(future.getDataTime());
+                    view.setActualPower(ent.getActualPower());
+                    view.setActualWindSpeed(ent.getActualWindSpeed());
+                    view.setActualWindDirection(ent.getActualWindDirection());
+                }
+            }
+            if (flag) {
+                view.setActualPower(BigDecimal.ZERO);
+                view.setActualWindSpeed(BigDecimal.ZERO);
+                view.setActualWindDirection(360);
+            }
+            historyList.add(view);
         }
         return historyList;
     }