修正首页数据异常

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

@@ -1540,11 +1540,57 @@ public class GenreSetPushService {
                         }
                     } else if (id.equals(QS)) {
                         wplist.add(wp);
+                    }else if (id.indexOf(FD)>0) {
+                        if (wp.getId().endsWith("FDC")) {
+                            wplist.add(wp);
+                        }
+                    } else if (id.indexOf(GF)>0)  {
+                        if (wp.getId().endsWith("GDC")) {
+                            wplist.add(wp);
+                        }
+                    } else if (id.indexOf(QS)>0) {
+                        wplist.add(wp);
                     }
 
                 }
 
 
+                Map<String,Double> sftjmap=new HashMap<>();//省份装机容量和台数统计
+                for (Windpowerstation wp : wplist) {
+
+                    if(StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid()+"_zjrl"))
+                    {
+
+                        double temp=sftjmap.get(wp.getCompanyid()+"_zjrl");
+                        temp=temp+wp.getCapacity();
+                        sftjmap.put(wp.getCompanyid()+"_zjrl",temp);
+                    }else
+                    {
+                        double temp=wp.getCapacity();
+                        sftjmap.put(wp.getCompanyid()+"_zjrl",temp);
+                    }
+                    if(StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid()+"_zjts"))
+                    {
+
+                        double temp=sftjmap.get(wp.getCompanyid()+"_zjts");
+                        temp=temp+wp.getQuantity();
+                        sftjmap.put(wp.getCompanyid()+"_zjts",temp);
+                    }else
+                    {
+                        double temp=wp.getQuantity();
+                        sftjmap.put(wp.getCompanyid()+"_zjts",temp);
+                    }
+                }
+
+
+                Set<Map.Entry<String, Double>> set = sftjmap.entrySet();
+                for (Iterator<Map.Entry<String,Double>> it = set.iterator(); it.hasNext();) {
+                    Map.Entry<String, Double> entry = (Map.Entry<String, Double>) it.next();
+
+                    // System.out.println(entry.getKey() + "--->" + entry.getValue());
+
+                    fcmap.put(entry.getKey(), entry.getValue());
+                }
                 for (Windpowerstation wp : wplist) {
 
                     zjrl += wp.getCapacity();