修改健康管理监视界面BUG

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

@@ -1385,46 +1385,6 @@ 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;
-                }
 
                 gxkmap.put("rsbklyl", wd.getDaysbklyl());
                 gxkmap.put("rzhcydl", wd.getDayzhcydl());
@@ -2962,13 +2922,9 @@ public class GenreSetPushService {
         List<PointData> swdls = realApiUtil.getHistoryDatasSnap(swdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
         List<PointData> gwdls = realApiUtil.getHistoryDatasSnap(gwdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
         List<PointData> ssfss =null;
-        if(wpId.equals("PL_GDC"))
-        {
-            ssfss = realApiUtil.getHistoryDatasSnap("PLGGL.NX_GD_PLG_YC_P1_L1_001_QXZ0001", beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
-        }else
-        {
-            ssfss = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
-        }
+
+        ssfss = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
+
         if (!rfdls.isEmpty() && !swdls.isEmpty() && !gwdls.isEmpty()
                 && rfdls.size() == swdls.size() && rfdls.size() == gwdls.size()
         ) {
@@ -3329,13 +3285,8 @@ public class GenreSetPushService {
         List<PointData> sjglls = realApiUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 3600L);
         List<PointData> ssfss =new ArrayList<>();
 
-        if(wpId.equals("PL_GDC"))
-        {
-            ssfss = realApiUtil.getHistoryDatasSnap("PLGGL.NX_GD_PLG_YC_P1_L1_001_QXZ0001", beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 3600L);
-        }else
-        {
-            ssfss = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 3600L);
-        }
+        ssfss = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 3600L);
+
         if (!rfdls.isEmpty() && !sjglls.isEmpty()
                 && rfdls.size() == sjglls.size()
         ) {

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/RealPowerPushService.java

@@ -141,28 +141,35 @@ public class RealPowerPushService {
                 c.add(Calendar.HOUR_OF_DAY,1);
             }
 
-            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> stations = new ArrayList<Windpowerstation>();
-                if (id.equals("") || id.equals(QS)) {
-                    for (Windpowerstation station : InitialRunner.wpallls) {
-                        stations.add(station);
-                    }
-                } else if (id.equals(FD)) {
-                    for (Windpowerstation station : InitialRunner.wpallls) {
-                        if (station.getId().endsWith("FDC")) {
-                            stations.add(station);
+                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")) {
+                            stations.add(wp);
                         }
-                    }
-                } else {
-                    for (Windpowerstation station : InitialRunner.wpallls) {
-                        if (station.getId().endsWith("GDC")) {
-                            stations.add(station);
+                    } else if (id.equals(GF)) {
+                        if (wp.getId().endsWith("GDC")) {
+                            stations.add(wp);
                         }
+                    } else if (id.equals(QS)) {
+                        stations.add(wp);
                     }
+
                 }
 
+
                 for (Windpowerstation station : stations) {