Merge remote-tracking branch 'origin/master'

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicPowerstation.java

@@ -178,5 +178,22 @@ public class ProBasicPowerstation extends Model {
      */
     private String spare4;
 
+    private Double appCapacity;
+    private Double conCapacity;
+    private Double gridCapacity;
+    private Double hoiCapacity;
+    private Double firstGridTime;
+    private Double wholeGridTime;
+    private Double anemoNumber;
+    private Double stationNumber;
+
+
+
+
+
+
+
+
+
 
 }

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

@@ -4321,20 +4321,27 @@ public class GenreSetPushService {
 
 
         WindpowerstationPG windpowerstationPG = InitialRunner.wppgmap.get(wpId);
-
-
         List<ProjectPG> projectPGs = InitialRunner.pjpggroupmap.get(windpowerstationPG.getId());
         Map czxx = new LinkedHashMap();
+        List<Map> qc = new ArrayList<>();
+
         int linenum = 0;
+        int i = 0;
 
         czxx.put("zjrl", windpowerstationPG.getCapacity());//装机容量
         for (ProjectPG p : projectPGs) {
-            czxx.put(p.getId() + "_capacity", p.getCapacity());//期次装机容量
+            Map qcls = new LinkedHashMap();
+            i++;
+            qcls.put("id",i);
+            qcls.put("name",p.getName()); //name : GJY01_GC
+            qcls.put("value",  p.getCapacity());//value :45
             linenum = linenum + InitialRunner.pjlnpgmap.get(p.getId()).size();
+            qc.add(qcls);
         }
+
         czxx.put("linenum", linenum);
         czxx.put("fjts", windpowerstationPG.getQuantity());//风机台数
-
+        czxx.put("issue",qc);
         return czxx;