风资源

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Windresourceanalysis/WindresourceanalysisService.java

@@ -68,11 +68,11 @@ public class WindresourceanalysisService {
         List<WindspeedVo> vos = new ArrayList<>();
 
         for (ProBasicWeatherStation wp : wplsf) {
-            if (wp.getId().contains("GJYF02")) continue;
+            if (wp.getId().contains("GJYF02") || wp.getId().contains("GJYF03") || wp.getId().contains("MLJ")) continue;
+
+
+            pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getWindpowerstationId(), ContantXk.SSPJFS);
 
-            if (!wp.getId().contains("MLJ")) {
-                pjfs = proBasicPowerstationPointService.getPowerstationPoint(wp.getWindpowerstationId(), ContantXk.SSPJFS);
-            }
             pjfx = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.FCCFTFX70);
 
             List<ProBasicPowerstation> collect = CacheContext.wplsf.stream().filter(c -> c.getId().equals(wp.getWindpowerstationId())).collect(Collectors.toList());