得到的

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

@@ -93,7 +93,7 @@ public class WindPredictionFutureService {
         //计算时间范围,开始时间往前推1天，结束时间往后推4小时
         DateTime beginTime = DateUtil.offsetDay(day, -1);
         DateTime endTime = DateUtil.offsetHour(day, 4);
-        return XListResult.success(getPowerOutput(context, beginTime, endTime, 0, input.getStationId()));
+        return XListResult.success(getPowerOutput(context, beginTime, endTime, input.getStationId()));
     }
 
     /*-----------------------------------统计分析(风能发电监控) todo 模拟数据 -----------------------------------*/
@@ -705,7 +705,7 @@ public class WindPredictionFutureService {
         }
         //时间出力截至时间
         DateTime endTime = DateUtil.offsetDay(inputTime, offsetDay);
-        return getPowerOutput(context, inputTime, endTime, 0, stationId);
+        return getPowerOutput(context, inputTime, endTime, stationId);
     }
 
     /**
@@ -714,11 +714,10 @@ public class WindPredictionFutureService {
      * @param context   上下文
      * @param beginTime 开始时间
      * @param endTime   结束时间
-     * @param betweenDay 日间
      * @param stationId 站点id
      * @return {@link List }<{@link GetWindPredictionFutureOutput }>
      */
-    private List<GetWindPredictionFutureOutput> getPowerOutput(XContext context, DateTime beginTime, DateTime endTime, int betweenDay, String stationId) {
+    private List<GetWindPredictionFutureOutput> getPowerOutput(XContext context, DateTime beginTime, DateTime endTime, String stationId) {
         //查预测功率
         Map<Date, WindPredictionFutureEnt> predictedMap = this.getPredictedMap(context, stationId, beginTime, endTime);
         //查实际功率
@@ -727,27 +726,20 @@ public class WindPredictionFutureService {
         List<DateTime> rangeToList = DateUtil.rangeToList(beginTime, endTime, DateField.MINUTE, 15);
         GetWindPredictionFutureOutput output;
         List<GetWindPredictionFutureOutput> outputs = new ArrayList<>(rangeToList.size());
-        Date dataDate;
         WindPredictionFutureEnt windPredictionFutureEnt;
         ThirdWindPowerGenerationEnt generationEnt;
         for (DateTime dateTime : rangeToList) {
             output = new GetWindPredictionFutureOutput();
-            //时间偏移
-            if (betweenDay != 0) {
-                dataDate = DateUtil.offsetDay(dateTime, betweenDay);
-            } else {
-                dataDate = dateTime;
-            }
-            output.setDataTime(dataDate);
+            output.setDataTime(dateTime);
             //匹配预测发电量
-            if (predictedMap.containsKey(dataDate)) {
-                windPredictionFutureEnt = predictedMap.get(dataDate);
+            if (predictedMap.containsKey(dateTime)) {
+                windPredictionFutureEnt = predictedMap.get(dateTime);
                 output.setPredictedPower(windPredictionFutureEnt.getPredictedPower());
                 output.setWindSpeed(windPredictionFutureEnt.getWindSpeed());
             }
             //匹配实际发电量
-            if (powerMap.containsKey(dataDate)) {
-                generationEnt = powerMap.get(dataDate);
+            if (powerMap.containsKey(dateTime)) {
+                generationEnt = powerMap.get(dateTime);
                 output.setActualWindSpeed(generationEnt.getActualWindSpeed());
                 output.setActualPower(generationEnt.getActualPower());
             }