feat(吉林演示): 松原

1.修改风资源监控页面历史风向统计接口,解决只能统计出一种风向问题,完成接口冒烟测试;
2.修改风资源监控页面风电站运行状态接口,解决没有启动状态时无法查询数据问题,完成接口冒烟测试;
3.修改风资源监控页面发电功率预测接口,增加使用模拟数据生成风电实际功率,完成接口冒烟测试;
4.修改风资源历史数据处理定时任务,增加模拟真实数据匹配逻辑,完成冒烟测试;
5.修改中期短期超短期风功率预测接口,增加模拟实际发电功率处理逻辑,完成接口冒烟测试;
6.修改中期短期超短期风功率预测接口,修改代码逻辑优化代码结构,完成接口冒烟测试;
7.修改中期短期超短期风功率预测接口,解决部分数据展示异常问题,完成接口冒烟测试;
8.修改风电站运行状态接口,增加模拟实际发电功率处理逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -436,18 +436,38 @@ public class WindPredictionFutureService {
             return XListResult.success(Collections.emptyList());
         }
         List<GetWindTurbineRunStatusOutput> outputs = new ArrayList<>(turbineList.size());
+        //实际数据
+        ThirdWindPowerGenerationUpdateMapper generationMapper = context.getBean(ThirdWindPowerGenerationUpdateMapper.class);
+        List<ThirdWindPowerGenerationUpdateEnt> list = generationMapper.selectList(new LambdaQueryWrapper<ThirdWindPowerGenerationUpdateEnt>()
+                .in(ThirdWindPowerGenerationUpdateEnt::getStationId, turbineList.stream()
+                        .map(BaseModel::getId)
+                        .collect(Collectors.toList()))
+                .ge(ThirdWindPowerGenerationUpdateEnt::getCollectTime, DateUtil.beginOfDay(DateUtil.date()))
+        );
+        Map<String, ThirdWindPowerGenerationUpdateEnt> collect;
+        if (CollUtil.isEmpty(list)) {
+            collect = Collections.emptyMap();
+        } else {
+            collect = list.stream()
+                    .collect(Collectors.toMap(ThirdWindPowerGenerationUpdateEnt::getStationId, Function.identity()));
+        }
         //封装数据
+        GetWindTurbineRunStatusOutput output;
+        ThirdWindPowerGenerationUpdateEnt ent;
         for (BaseWindTurbineEnt turbine : turbineList) {
-            outputs.add(
-                    GetWindTurbineRunStatusOutput.builder()
-                            .stationId(turbine.getId())
-                            .stationName(turbine.getStationName())
-                            //todo 暂时没有实际数据
-                            .runState("启动")
-                            .activePower(BigDecimal.ZERO)
-                            .actualWindSpeed(BigDecimal.ZERO)
-                            .build()
-            );
+            output = new GetWindTurbineRunStatusOutput();
+            output.setStationId(turbine.getId());
+            output.setStationName(turbine.getStationName());
+            output.setRunState("启动");
+            if (collect.containsKey(turbine.getId())) {
+                ent = collect.get(turbine.getId());
+                output.setActivePower(ent.getActualPower());
+                output.setActualWindSpeed(ent.getActualWindSpeed());
+            } else {
+                output.setActivePower(BigDecimal.ZERO);
+                output.setActualWindSpeed(BigDecimal.ZERO);
+            }
+            outputs.add(output);
         }
         return XListResult.success(outputs);
     }