调整上报数据页面nwp没有数据

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/ComprehensiveContrastService.java

@@ -37,10 +37,13 @@ public class ComprehensiveContrastService extends BaseService {
   private final ForecastPowerShortTermOneHisService forecastPowerShortTermOneHisService;
 
   private final PowerStationStatusDataService powerStationStatusDataService;
+  private final PowerStationStatusDataOneService powerStationStatusDataOneService;
   private final WeatherStationStatusDataService weatherStationStatusDataService;
   private final WindTowerStatusDataService windTowerStatusDataService;
   private final DisplayConfigService displayConfigService;
   private final NwpHisService nwpHisService;
+  private final NwpService nwpService;
+  private final NwpOneService nwpOneService;
   private final SysParameterRepository sysParameterRepository;
 
   @Autowired
@@ -56,7 +59,7 @@ public class ComprehensiveContrastService extends BaseService {
                                       ForecastPowerUltraShortTermHisRepository forecastPowerUltraShortTermHisRepository,
                                       ForecastPowerShortTermHisRepository forecastPowerShortTermHisRepository,
                                       WeatherStationStatusDataRepository weatherStationStatusDataRepository,
-                                      WindTowerStatusDataRepository windTowerStatusDataRepository, ForecastPowerUltraShortTermOneHisService forecastPowerUltraShortTermOneHisService, ForecastPowerShortTermOneHisService forecastPowerShortTermOneHisService) {
+                                      WindTowerStatusDataRepository windTowerStatusDataRepository, ForecastPowerUltraShortTermOneHisService forecastPowerUltraShortTermOneHisService, ForecastPowerShortTermOneHisService forecastPowerShortTermOneHisService, PowerStationStatusDataOneService powerStationStatusDataOneService, NwpService nwpService, NwpOneService nwpOneService) {
     this.forecastPowerUltraShortTermHisService = forecastPowerUltraShortTermHisService;
     this.forecastPowerShortTermHisService = forecastPowerShortTermHisService;
     this.powerStationStatusDataService = powerStationStatusDataService;
@@ -73,6 +76,9 @@ public class ComprehensiveContrastService extends BaseService {
 
     this.forecastPowerUltraShortTermOneHisService = forecastPowerUltraShortTermOneHisService;
     this.forecastPowerShortTermOneHisService = forecastPowerShortTermOneHisService;
+    this.powerStationStatusDataOneService = powerStationStatusDataOneService;
+    this.nwpService = nwpService;
+    this.nwpOneService = nwpOneService;
   }
 
 
@@ -107,10 +113,18 @@ public class ComprehensiveContrastService extends BaseService {
     }
     List<Float> dqList = (List<Float>) dqMap.get("datas");
     List<Float> cdqList = (List<Float>) cdqMap.get("datas");
-    List<NwpHis> nwpHisList = nwpHisService.findByPreTimeBetweenAndForecastHowLongAgo(startTime, endTime, nwpAgo, jgTime);
+
+
+    if (otherType.equals("E1")){
+      // 光伏
+      rpMap = powerStationStatusDataService.findByTimeBetweenForContrast(new Date(startTime), new Date(endTime), jgTime);
+    }
+    else{
+      // 风电
+      rpMap = powerStationStatusDataOneService.findByTimeBetweenForContrast(new Date(startTime), new Date(endTime), jgTime);
+    }
 
     //实时数据
-    rpMap = powerStationStatusDataService.findByTimeBetweenForContrast(new Date(startTime), new Date(endTime), jgTime);
     times = (List<String>) rpMap.get("times");
     List<Float> realValueList = (List<Float>) rpMap.get("realDatas");
     List<Float> ableValueList = (List<Float>) rpMap.get("ableDatas");
@@ -279,9 +293,10 @@ public class ComprehensiveContrastService extends BaseService {
             resultMap.put("wsInst120", "");
           }
         }
+        List<Nwp> nwpHisList = nwpService.findByPreTimeBetween(startTime, endTime, jgTime);
         boolean nb = nwpHisList.stream().filter(m -> sdf.format(m.getPreTime()).equals(time)).findAny().isPresent();
         if (nb) {
-          NwpHis nwpHis = nwpHisList.stream().filter(o -> sdf.format(o.getPreTime()).equals(time)).findAny().orElse(null);
+          Nwp nwpHis = nwpHisList.stream().filter(o -> sdf.format(o.getPreTime()).equals(time)).findAny().orElse(null);
           if (Arrays.asList(showCode).contains("ws10")) {
             //十米
             resultMap.put("ws10", nwpHis.getWs10().floatValue() == -99 ? "" : nwpHis.getWs10());
@@ -457,9 +472,10 @@ public class ComprehensiveContrastService extends BaseService {
               resultMap.put("obliqueR", "");
             }
           }
+          List<NwpOne> nwpHisList = nwpOneService.findByPreTimeBetween(startTime, endTime, jgTime);
           boolean nb = nwpHisList.stream().filter(m -> sdf.format(m.getPreTime()).equals(time)).findAny().isPresent();
           if (nb) {
-            NwpHis nwpHis = nwpHisList.stream().filter(o -> sdf.format(o.getPreTime()).equals(time)).findAny().orElse(null);
+            NwpOne nwpHis = nwpHisList.stream().filter(o -> sdf.format(o.getPreTime()).equals(time)).findAny().orElse(null);
             if (Arrays.asList(showCode).contains("swr")) {
               //辐射
               resultMap.put("swr", nwpHis.getSwr().floatValue() == -99 ? "" : nwpHis.getSwr());