修改nwp 如果修改后的nwp值则用修改后的nwp

ipfcst/ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/job/ForecastPowerShortTermGeneratorJob.java

@@ -60,6 +60,8 @@ public class ForecastPowerShortTermGeneratorJob extends BaseService {
   ForecastPowerShortTermRepository forecastPowerShortTermRepository;
   @Autowired
   ModifyShorterDataRepository modifyShorterDataRepository;
+  @Autowired
+  NwpSpeedModifiedRespository nwpSpeedModifiedRespository;
 
   //模板风机为key,其它风机id及风速为value
   public static Map<String,List<String>> moduleFanMaps = new HashMap<>();
@@ -130,9 +132,24 @@ public class ForecastPowerShortTermGeneratorJob extends BaseService {
     long startTimes = getMillisecondsSubDay();
     long endTimes = startTimes + dayNum * 24 * 60 * 60 * 1000 - 15 * 60 * 1000;
     List<Nwp> nwpData = nwpService.getNwpData(startTimes, endTimes);
-    // List<Nwp> listTemperature = nwpRepository.findByPreTimeBetween(startTimes, endTimes);
-    // //排序后根据预测时间过滤
-    // listTemperature = listTemperature.stream().sorted(Comparator.comparing(Nwp::getPreTime)).filter(distinctByKey(Nwp::getPreTime)).collect(Collectors.toList());
+    List<NwpSpeedModified> nwpSpeedModifieds = nwpSpeedModifiedRespository.findByPreTimeBetween(startTimes, endTimes);
+    // 用修改后的风速值替换原值
+    if(nwpSpeedModifieds.size() > 0){
+      for(NwpSpeedModified nwpSpeedModified: nwpSpeedModifieds){
+        for(Nwp nwp:nwpData){
+          if(nwp.getPreTime() == nwpSpeedModified.getPreTime()){
+            nwp.setWs10(nwpSpeedModified.getWs10());
+            nwp.setWs30(nwpSpeedModified.getWs30());
+            nwp.setWs50(nwpSpeedModified.getWs50());
+            nwp.setWs70(nwpSpeedModified.getWs70());
+            nwp.setWs80(nwpSpeedModified.getWs80());
+            nwp.setWs90(nwpSpeedModified.getWs90());
+            nwp.setWs100(nwpSpeedModified.getWs100());
+            nwp.setWs170(nwpSpeedModified.getWs170());
+          }
+        }
+      }
+    }
     return nwpData;
   }