修改功率曲线接口bug

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

@@ -1019,35 +1019,42 @@ public class RealPowerPushService {
 
         List<Object> resultls = new ArrayList<Object>();
         if (StringUtils.notEmp(id)) {
-            if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
-
-                if (id.equals("") || id.equals(QS)) {
-                    for (Windpowerstation station : InitialRunner.wpallls) {
-                        DataVo vo = new DataVo();
-                        vo.setId(station.getId());
-                        vo.setName(station.getName());
-                        vols.add(vo);
-                    }
-                } else if (id.equals(FD)) {
-                    for (Windpowerstation station : InitialRunner.wpallls) {
-                        if (station.getId().endsWith("FDC")) {
-                            DataVo vo = new DataVo();
-                            vo.setId(station.getId());
-                            vo.setName(station.getName());
-                            vols.add(vo);
-                        }
-                    }
+
+
+            if (id.endsWith(QS) || id.endsWith(FD) || id.endsWith(GF) || InitialRunner.re_wpmap.containsKey(id)) {
+
+
+                //初始化场站信息
+
+                List<Windpowerstation> wplist = new ArrayList<>();
+
+                if (InitialRunner.re_wpmap.containsKey(id)) {
+                    wplist = InitialRunner.re_wpmap.get(id);
                 } else {
-                    for (Windpowerstation station : InitialRunner.wpallls) {
-                        if (station.getId().endsWith("GDC")) {
+                    for (Windpowerstation wp : InitialRunner.wpallls) {
+                        if (id.indexOf(FD) > -1) {
+                            if (wp.getId().endsWith("FDC")) {
+                                DataVo vo = new DataVo();
+                                vo.setId(wp.getId());
+                                vo.setName(wp.getName());
+                                vols.add(vo);
+                            }
+                        } else if (id.indexOf(GF) > -1) {
+                            if (wp.getId().endsWith("GDC")) {
+                                DataVo vo = new DataVo();
+                                vo.setId(wp.getId());
+                                vo.setName(wp.getName());
+                                vols.add(vo);
+                            }
+                        } else if (id.indexOf(QS) > -1) {
                             DataVo vo = new DataVo();
-                            vo.setId(station.getId());
-                            vo.setName(station.getName());
+                            vo.setId(wp.getId());
+                            vo.setName(wp.getName());
                             vols.add(vo);
                         }
                     }
                 }
-            } else if (InitialRunner.wpmap.containsKey(id)) {
+            }else if (InitialRunner.wpmap.containsKey(id)) {
                 for (Project pj : InitialRunner.pjsmap.get(id)) {
                     DataVo vo = new DataVo();
                     vo.setId(pj.getId());