feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -669,12 +669,8 @@ public class WindPredictionFutureService {
             inputTime = DateUtil.parse(inputTimeStr, BusinessConstant.DATE_FORMAT_DAY);
         }
         //时间出力截至时间
-        DateTime day = inputTime;
-        int betweenDay = 0;
-        //输入时间等于当日时间时,进行演示开关校验
-        DateTime beginTime = DateUtil.offsetMinute(day, -1);
-        DateTime endTime = DateUtil.offsetDay(day, offsetDay);
-        return getPowerOutput(context, beginTime, endTime, betweenDay, stationId);
+        DateTime endTime = DateUtil.offsetDay(inputTime, offsetDay);
+        return getPowerOutput(context, inputTime, endTime, 0, stationId);
     }
 
     /**
@@ -737,7 +733,8 @@ public class WindPredictionFutureService {
     private Map<Date, WindPredictionFutureEnt> getPredictedMap(XContext context, String stationId, DateTime beginTime, DateTime endTime) {
         WindPredictionFutureMapper mapper = context.getBean(WindPredictionFutureMapper.class);
         List<WindPredictionFutureEnt> predictedList = mapper.selectList(new QueryWrapper<WindPredictionFutureEnt>()
-                .select("data_time", "IFNULL( MAX( predicted_power ), 0 ) AS predicted_power", "actual_wind_speed", "wind_speed")
+                .select("data_time", "IFNULL( MAX( predicted_power ), 0 ) AS predicted_power",
+                        "IFNULL( MAX( actual_wind_speed ), 0 ) AS actual_wind_speed", "IFNULL( MAX( wind_speed ), 0 ) AS wind_speed")
                 .lambda()
                 .eq(WindPredictionFutureEnt::getStationId, stationId)
                 .between(WindPredictionFutureEnt::getDataTime, beginTime, endTime)