jhjhj

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

@@ -293,10 +293,10 @@ public class ComprehensiveContrastService extends BaseService {
             resultMap.put("wsInst120", "");
           }
         }
-        List<Nwp> nwpHisList = nwpService.findByPreTimeBetween(startTime, endTime, jgTime);
+        List<NwpOne> nwpHisList = nwpOneService.findByPreTimeBetween(startTime, endTime, jgTime);
         boolean nb = nwpHisList.stream().filter(m -> sdf.format(m.getPreTime()).equals(time)).findAny().isPresent();
         if (nb) {
-          Nwp 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("ws10")) {
             //十米
             resultMap.put("ws10", nwpHis.getWs10().floatValue() == -99 ? "" : nwpHis.getWs10());
@@ -472,10 +472,10 @@ public class ComprehensiveContrastService extends BaseService {
               resultMap.put("obliqueR", "");
             }
           }
-          List<NwpOne> nwpHisList = nwpOneService.findByPreTimeBetween(startTime, endTime, jgTime);
+          List<Nwp> nwpHisList = nwpService.findByPreTimeBetween(startTime, endTime, jgTime);
           boolean nb = nwpHisList.stream().filter(m -> sdf.format(m.getPreTime()).equals(time)).findAny().isPresent();
           if (nb) {
-            NwpOne 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("swr")) {
               //辐射
               resultMap.put("swr", nwpHis.getSwr().floatValue() == -99 ? "" : nwpHis.getSwr());