Merge branch 'master' of http://124.70.43.205:3000/xieshengjie/sis

realtime/generationXK-service/src/main/java/com/gyee/generation/init/CacheContext.java

@@ -507,7 +507,7 @@ public class CacheContext implements CommandLineRunner {
         });
 
 
-        zwpls = proBasicWindpowerstationService.list().stream().filter(i->i.getIsAble()==1).collect(Collectors.toList());;
+        zwpls = proBasicWindpowerstationService.list().stream().filter(i->runWpids.contains(i.getId())&& i.getIsAble()==1).collect(Collectors.toList());
         wpls = proBasicWindpowerstationService.list().stream().filter(i->runWpids.contains(i.getId()) && i.getIsAble()==1).collect(Collectors.toList());;
         meterpoints = proBasicMeterPointService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId()) && i.getIsAble()==1).collect(Collectors.toList());
         meterpoints.stream().forEach(meterpoint -> {