feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -89,16 +89,11 @@ public class WindPredictionFutureService {
             inputTime = DateUtil.parse(now.toString(BusinessConstant.DATE_FORMAT_DAY) + " " + inputStartTime + BusinessConstant.INITIALIZATION_SECOND);
         }
         //时间出力截至时间
-        int betweenDay = 0;
         DateTime day = inputTime;
         //计算时间范围,开始时间往前推1天，结束时间往后推4小时
         DateTime beginTime = DateUtil.offsetDay(day, -1);
         DateTime endTime = DateUtil.offsetHour(day, 4);
-        //查预测功率
-        Map<Date, WindPredictionFutureEnt> predictedMap = this.getPredictedMap(context, input.getStationId(), beginTime, endTime);
-        //查实际功率
-        Map<Date, ThirdWindPowerGenerationEnt> powerMap = this.getActivePower15MinuteMap(context, input.getStationId(), beginTime, endTime);
-        return XListResult.success(getPowerOutput(beginTime, endTime, betweenDay, now, predictedMap, powerMap));
+        return XListResult.success(getPowerOutput(context, beginTime, endTime, 0, input.getStationId()));
     }
 
     /*-----------------------------------统计分析(风能发电监控) todo 模拟数据-----------------------------------*/
@@ -679,26 +674,24 @@ public class WindPredictionFutureService {
         //输入时间等于当日时间时,进行演示开关校验
         DateTime beginTime = DateUtil.offsetMinute(day, -1);
         DateTime endTime = DateUtil.offsetDay(day, offsetDay);
-        //查预测功率
-        Map<Date, WindPredictionFutureEnt> predictedMap = this.getPredictedMap(context, stationId, beginTime, endTime);
-        //查实际功率
-        Map<Date, ThirdWindPowerGenerationEnt> powerMap = this.getActivePower15MinuteMap(context, stationId, beginTime, endTime);
-        return getPowerOutput(day, endTime, betweenDay, date, predictedMap, powerMap);
+        return getPowerOutput(context, beginTime, endTime, betweenDay, stationId);
     }
 
     /**
      * 获得预测功率输出
      *
+     * @param context    上下文
      * @param beginTime  开始时间
      * @param endTime    结束时间
-     * @param betweenDay   天之间
-     * @param now          现在
-     * @param predictedMap 预测地图
-     * @param powerMap     功率图
+     * @param betweenDay 日间
+     * @param stationId  站点id
      * @return {@link List }<{@link GetWindPredictionFutureOutput }>
      */
-    private List<GetWindPredictionFutureOutput> getPowerOutput(DateTime beginTime, DateTime endTime, int betweenDay, Date now,
-                                                               Map<Date, WindPredictionFutureEnt> predictedMap, Map<Date, ThirdWindPowerGenerationEnt> powerMap) {
+    private List<GetWindPredictionFutureOutput> getPowerOutput(XContext context, DateTime beginTime, DateTime endTime, int betweenDay, String stationId) {
+        //查预测功率
+        Map<Date, WindPredictionFutureEnt> predictedMap = this.getPredictedMap(context, stationId, beginTime, endTime);
+        //查实际功率
+        Map<Date, ThirdWindPowerGenerationEnt> powerMap = this.getActivePower15MinuteMap(context, stationId, beginTime, endTime);
         //取时间范围
         List<DateTime> rangeToList = DateUtil.rangeToList(beginTime, endTime, DateField.MINUTE, 15);
         GetWindPredictionFutureOutput output;