修改配置信息和多适配器切换

web/monitor-hb/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -84,7 +84,7 @@ public class InitialRunner implements CommandLineRunner {
     public static Map<String, Project> pjmap = new HashMap<String, Project>(); // 项目MAP（包含光电电）
     public static Map<String, Line> lnmap = new HashMap<String, Line>(); // 线路（包含光电电）
     public static Map<String, Windturbine> wtmap = new HashMap<String, Windturbine>();//风机（包含光电电）
-
+    public static Map<String, List<Windpowerstation>> re_wpmap = new HashMap<String, List<Windpowerstation>>();
     public static Map<String, Stoptype> stoptypemap = new HashMap<String, Stoptype>();//停机类型
     public static List<Warning2> warnls = new ArrayList<Warning2>(); // 报警LIST集合
     public static Map<String, Warning2> warningmap = new HashMap<String, Warning2>();// 报警MAP集合
@@ -119,7 +119,9 @@ public class InitialRunner implements CommandLineRunner {
     public static Map<String,Integer> wppointnummap=new HashMap<>();
     Map<String, Object> ycmap = new HashMap<>();
 
-
+    private final String QS = "0";
+    private final String FD = "-1";
+    private final String GF = "-2";
 
     @Override
     public void run(String... args) throws Exception {
@@ -211,13 +213,72 @@ public class InitialRunner implements CommandLineRunner {
         windpowerstationExample.setOrderByClause("ordernum ASC");
 //        windpowerstationExample.createCriteria().andIdNotLike("%SY_FDC%");
         wpallls = windpowerstationService.selectByExample(windpowerstationExample);
+//        if (!wpallls.isEmpty()) {
+//            for (Windpowerstation wp : wpallls) {
+//                if (wp.getId().endsWith("FDC")) {
+//                    wpls.add(wp);
+//                }
+//                if (wp.getId().endsWith("GDC")) {
+//                	spls.add(wp);
+//                }
+//                wpmap.put(wp.getId(), wp);
+//            }
+//        }
+
+
         if (!wpallls.isEmpty()) {
             for (Windpowerstation wp : wpallls) {
                 if (wp.getId().endsWith("FDC")) {
                     wpls.add(wp);
                 }
                 if (wp.getId().endsWith("GDC")) {
-                	spls.add(wp);
+                    spls.add(wp);
+                }
+
+                if(re_wpmap.containsKey(wp.getCompanyid()+QS))
+                {
+                    List<Windpowerstation> ls=re_wpmap.get(wp.getCompanyid()+QS);
+                    ls.add(wp);
+                    re_wpmap.put(wp.getCompanyid()+QS,ls);
+                }else {
+                    List<Windpowerstation> ls=new ArrayList<>();
+                    ls.add(wp);
+                    re_wpmap.put(wp.getCompanyid()+QS,ls);
+                }
+
+
+                if(re_wpmap.containsKey(wp.getCompanyid()+FD))
+                {
+                    List<Windpowerstation> ls=re_wpmap.get(wp.getCompanyid()+FD);
+                    if(wp.getId().endsWith("FDC"))
+                    {
+                        ls.add(wp);
+                        re_wpmap.put(wp.getCompanyid()+FD,ls);
+                    }
+                }else {
+                    List<Windpowerstation> ls=new ArrayList<>();
+                    if(wp.getId().endsWith("FDC"))
+                    {
+                        ls.add(wp);
+                        re_wpmap.put(wp.getCompanyid()+FD,ls);
+                    }
+                }
+
+                if(re_wpmap.containsKey(wp.getCompanyid()+GF))
+                {
+                    List<Windpowerstation> ls=re_wpmap.get(wp.getCompanyid()+GF);
+                    if(wp.getId().endsWith("GDC"))
+                    {
+                        ls.add(wp);
+                        re_wpmap.put(wp.getCompanyid()+GF,ls);
+                    }
+                }else {
+                    List<Windpowerstation> ls=new ArrayList<>();
+                    if(wp.getId().endsWith("GDC"))
+                    {
+                        ls.add(wp);
+                        re_wpmap.put(wp.getCompanyid()+GF,ls);
+                    }
                 }
                 wpmap.put(wp.getId(), wp);
             }

web/monitor-hb/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -102,14 +102,22 @@ public class GenreSetPushService {
 
             Map<String, Object> fcmap = new HashMap<>();
 
-            if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
+              if (id.equals(QS) || id.equals(FD) || id.equals(GF) || InitialRunner.re_wpmap.containsKey(id)) {
 
 
                 //初始化场站信息
 
                 List<Windpowerstation> wplist = new ArrayList<>();
-
-                for (Windpowerstation wp : InitialRunner.wpallls) {
+                  List<Windpowerstation> templs=null;
+
+                  if(InitialRunner.re_wpmap.containsKey(id))
+                  {
+                      templs=InitialRunner.re_wpmap.get(id);
+                  }else
+                  {
+                      templs=InitialRunner.wpallls;
+                  }
+                for (Windpowerstation wp : templs) {
                     if (id.equals(FD)) {
                         if (wp.getId().endsWith("FDC")) {
                             wplist.add(wp);
@@ -266,13 +274,21 @@ public class GenreSetPushService {
 
             Map<String, Double> mxztmap = new HashMap<>();
 
-            if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
+                   if (id.equals(QS) || id.equals(FD) || id.equals(GF) || InitialRunner.re_wpmap.containsKey(id)) {
 
                 //初始化场站信息
 
                 List<Windpowerstation> wplist = new ArrayList<>();
-
-                for (Windpowerstation wp : InitialRunner.wpallls) {
+                       List<Windpowerstation> templs=null;
+
+                       if(InitialRunner.re_wpmap.containsKey(id))
+                       {
+                           templs=InitialRunner.re_wpmap.get(id);
+                       }else
+                       {
+                           templs=InitialRunner.wpallls;
+                       }
+                for (Windpowerstation wp : templs) {
                     if (id.equals(FD)) {
                         if (wp.getId().endsWith("FDC")) {
                             wplist.add(wp);
@@ -1541,14 +1557,22 @@ public class GenreSetPushService {
 
             Map<String, Object> fcmap = new HashMap<>();
 
-            if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
+                   if (id.equals(QS) || id.equals(FD) || id.equals(GF) || InitialRunner.re_wpmap.containsKey(id)) {
 
 
                 //初始化场站信息
 
                 List<Windpowerstation> wplist = new ArrayList<>();
-
-                for (Windpowerstation wp : InitialRunner.wpallls) {
+                       List<Windpowerstation> templs=null;
+
+                       if(InitialRunner.re_wpmap.containsKey(id))
+                       {
+                           templs=InitialRunner.re_wpmap.get(id);
+                       }else
+                       {
+                           templs=InitialRunner.wpallls;
+                       }
+                for (Windpowerstation wp : templs) {
                     if (id.equals(FD)) {
                         if (wp.getId().endsWith("FDC")) {
                             wplist.add(wp);
@@ -1931,13 +1955,21 @@ public class GenreSetPushService {
 
             Map<String, Double> mxztmap = new HashMap<>();
 
-            if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
+                   if (id.equals(QS) || id.equals(FD) || id.equals(GF) || InitialRunner.re_wpmap.containsKey(id)) {
 
                 //初始化场站信息
 
                 List<Windpowerstation> wplist = new ArrayList<>();
-
-                for (Windpowerstation wp : InitialRunner.wpallls) {
+               List<Windpowerstation> templs=null;
+
+               if(InitialRunner.re_wpmap.containsKey(id))
+               {
+                   templs=InitialRunner.re_wpmap.get(id);
+               }else
+               {
+                   templs=InitialRunner.wpallls;
+               }
+                for (Windpowerstation wp : templs) {
                     if (id.equals(FD)) {
                         if (wp.getId().endsWith("FDC")) {
                             wplist.add(wp);
@@ -2670,46 +2702,46 @@ public class GenreSetPushService {
                 gxkmap.put("yzhcydl", wd.getMonthzhcydl());
 
 
-                switch (id) {
-                    case "0":
-                        gxkmap.put("yzhcydl", 1.56);
-                        break;
-                    case "-1":
-                        gxkmap.put("yzhcydl", 1.32);
-                        break;
-                    case "-2":
-                        gxkmap.put("yzhcydl", 1.78);
-                        break;
-                    case "MHS_FDC":
-                        gxkmap.put("yzhcydl", 1.06);
-                        break;
-                    case "NSS_FDC":
-                        gxkmap.put("yzhcydl", 1.52);
-                        break;
-                    case "QS_FDC":
-                        gxkmap.put("yzhcydl", 1.37);
-                        break;
-                    case "SBQ_FDC":
-                        gxkmap.put("yzhcydl", 1.68);
-                        break;
-                    case "XS_FDC":
-                        gxkmap.put("yzhcydl", 0.82);
-                        break;
-                    case "DWK_GDC":
-                        gxkmap.put("yzhcydl", 0.0);
-                        break;
-                    case "PL_GDC":
-                        gxkmap.put("yzhcydl", 2.1);
-                        break;
-                    case "XH_GDC":
-                        gxkmap.put("yzhcydl", 1.83);
-                        break;
-                    case "MCH_GDC":
-                        gxkmap.put("yzhcydl", 1.58);
-                        break;
-                    default:
-                        break;
-                }
+//                switch (id) {
+//                    case "0":
+//                        gxkmap.put("yzhcydl", 1.56);
+//                        break;
+//                    case "-1":
+//                        gxkmap.put("yzhcydl", 1.32);
+//                        break;
+//                    case "-2":
+//                        gxkmap.put("yzhcydl", 1.78);
+//                        break;
+//                    case "MHS_FDC":
+//                        gxkmap.put("yzhcydl", 1.06);
+//                        break;
+//                    case "NSS_FDC":
+//                        gxkmap.put("yzhcydl", 1.52);
+//                        break;
+//                    case "QS_FDC":
+//                        gxkmap.put("yzhcydl", 1.37);
+//                        break;
+//                    case "SBQ_FDC":
+//                        gxkmap.put("yzhcydl", 1.68);
+//                        break;
+//                    case "XS_FDC":
+//                        gxkmap.put("yzhcydl", 0.82);
+//                        break;
+//                    case "DWK_GDC":
+//                        gxkmap.put("yzhcydl", 0.0);
+//                        break;
+//                    case "PL_GDC":
+//                        gxkmap.put("yzhcydl", 2.1);
+//                        break;
+//                    case "XH_GDC":
+//                        gxkmap.put("yzhcydl", 1.83);
+//                        break;
+//                    case "MCH_GDC":
+//                        gxkmap.put("yzhcydl", 1.58);
+//                        break;
+//                    default:
+//                        break;
+//                }
 
                 gxkmap.put("rsbklyl", wd.getDaysbklyl());
                 gxkmap.put("rzhcydl", wd.getDayzhcydl());
@@ -3346,6 +3378,15 @@ public class GenreSetPushService {
                 if (pl.getWindpower().endsWith("GDC")) {
                     planlist.add(pl);
                 }
+            }else if (InitialRunner.re_wpmap.containsKey(id)) {
+                List<Windpowerstation> templs=InitialRunner.re_wpmap.get(id);
+                for(Windpowerstation wp:templs)
+                {
+                    if (pl.getWindpower().equals(wp.getId())) {
+                        planlist.add(pl);
+                        break;
+                    }
+                }
             } else if (InitialRunner.wpmap.containsKey(id)) {
                 if (pl.getWindpower().equals(id)) {
                     planlist.add(pl);