修改缓存类

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

@@ -47,14 +47,21 @@ public class CacheContext implements CommandLineRunner {
     @Resource
     private IProBasicModelPowerService proBasicModelPowerService;
 
+    @Resource
+    private IProBasicSquareService proBasicSquareService;
+
     @Value("${runWindpowerstation}")
     private String runWindpowerstation;
 
     public static List<ProBasicWindturbine> wtls = new ArrayList<>();
     public static List<ProBasicProject> projects = new ArrayList<>();
     public static List<ProBasicLine>  lines = new ArrayList<>();
+
+    public static List<ProBasicSquare> sqls = new ArrayList<>();
     public static List<ProBasicWindpowerstation>  wpls = new ArrayList<>();
 
+    public static Map<String,ProBasicLine> lnmap = new HashMap<>();
+    public static Map<String,ProBasicSquare> sqmap = new HashMap<>();
     public static Map<String,ProBasicWindpowerstation> wpmap = new HashMap<>();
     public static List<ProBasicMeterPoint>  meterpoints = new ArrayList<>();
     public static Map<String,ProBasicMeterPoint>  meterpointMap = new HashMap<>();
@@ -63,6 +70,9 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String,List<ProBasicWindturbine>> wpwtmap = new HashMap<>();
     public static Map<String,List<ProBasicWindturbine>> pjwtmap = new HashMap<>();
     public static Map<String,List<ProBasicWindturbine>> lnwtmap = new HashMap<>();
+
+
+    public static Map<String,List<ProBasicWindturbine>> sqwtmap = new HashMap<>();
     public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = new HashMap<>();// 风电机测点AI表
     public static Map<String,Map<String, ProBasicWppoint>> linepointmap =new HashMap<>();
     public static Map<String,Map<String, ProBasicWppoint>> propointmap =new HashMap<>();
@@ -112,6 +122,15 @@ public class CacheContext implements CommandLineRunner {
                 }
             }
         }
+
+        sqls=proBasicSquareService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId())).collect(Collectors.toList());
+        if(!sqls.isEmpty())
+        {
+            for(ProBasicSquare sq:sqls)
+            {
+                sqmap.put(sq.getId(),sq);
+            }
+        }
         wtls = proBasicWindturbineService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId())).collect(Collectors.toList());
         logger.info(wtls.size()+"");
         wtls.forEach(wt->{
@@ -149,6 +168,14 @@ public class CacheContext implements CommandLineRunner {
                 lines.add(wt);
                 lnwtmap.put(wt.getLineId(),lines);
             }
+
+            if (sqwtmap.containsKey(wt.getSquareId())){
+                sqwtmap.get(wt.getSquareId()).add(wt);
+            }else {
+                List<ProBasicWindturbine> lines = new ArrayList<>();
+                lines.add(wt);
+                sqwtmap.put(wt.getSquareId(),lines);
+            }
         });
 
         //初始化标杆风机
@@ -213,6 +240,7 @@ public class CacheContext implements CommandLineRunner {
 
         lines = proBasicLineService.list().stream().filter(i-> StringUtils.isNotNull(proMap.get(i.getProjectId())) && runWpids.contains(proMap.get(i.getProjectId()).getWindpowerstationId())).collect(Collectors.toList());
         lines.stream().forEach(l->{
+            lnmap.put(l.getId(),l);
             if (prolinemap.containsKey(l.getProjectId())){
                 prolinemap.get(l.getProjectId()).add(l);
             }else {