数据修改

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

@@ -1799,34 +1799,34 @@ public class GenreSetPushService {
                         {
                             if(sq.getTypes().equals(ZC))
                             {
-                                if (StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid() + "_zc_zjts")) {
+                                if (StringUtils.notEmp(wp.getPhoto()) && sftjmap.containsKey(wp.getPhoto() + "_zc_zjts")) {
 
-                                    double temp = sftjmap.get(wp.getCompanyid() + "_zc_zjts");
+                                    double temp = sftjmap.get(wp.getPhoto() + "_zc_zjts");
                                     if(InitialRunner.sq_nbqmap.containsKey(sq.getId()))
                                     {
                                         List<Inverter> nbqls=InitialRunner.sq_nbqmap.get(sq.getId());
                                         temp = temp + nbqls.size();
                                     }
 
-                                    sftjmap.put(wp.getCompanyid() + "_zc_zjts", temp);
+                                    sftjmap.put(wp.getPhoto() + "_zc_zjts", temp);
                                 } else {
                                     double temp = wp.getCapacity();
-                                    sftjmap.put(wp.getCompanyid() + "_zc_zjts", temp);
+                                    sftjmap.put(wp.getPhoto() + "_zc_zjts", temp);
                                 }
                             }else
                             {
-                                if (StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid() + "_jz_zjts")) {
+                                if (StringUtils.notEmp(wp.getPhoto()) && sftjmap.containsKey(wp.getPhoto() + "_jz_zjts")) {
 
-                                    double temp = sftjmap.get(wp.getCompanyid() + "_jz_zjts");
+                                    double temp = sftjmap.get(wp.getPhoto() + "_jz_zjts");
                                     if(InitialRunner.sq_nbqmap.containsKey(sq.getId()))
                                     {
                                         List<Inverter> nbqls=InitialRunner.sq_nbqmap.get(sq.getId());
                                         temp = temp + nbqls.size();
                                     }
-                                    sftjmap.put(wp.getCompanyid() + "_jz_zjts", temp);
+                                    sftjmap.put(wp.getPhoto() + "_jz_zjts", temp);
                                 } else {
                                     double temp = wp.getCapacity();
-                                    sftjmap.put(wp.getCompanyid() + "_jz_zjts", temp);
+                                    sftjmap.put(wp.getPhoto() + "_jz_zjts", temp);
                                 }
                             }
                         }
@@ -1834,19 +1834,84 @@ public class GenreSetPushService {
                     else
                     {
 
-                        if (StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid() + "_zjts")) {
+                        if (StringUtils.notEmp(wp.getPhoto()) && sftjmap.containsKey(wp.getPhoto() + "_zjts")) {
 
-                            double temp = sftjmap.get(wp.getCompanyid() + "_zjts");
+                            double temp = sftjmap.get(wp.getPhoto() + "_zjts");
                             temp = temp + wp.getQuantity();
-                            sftjmap.put(wp.getCompanyid() + "_zjts", temp);
+                            sftjmap.put(wp.getPhoto() + "_zjts", temp);
                         } else {
                             double temp = wp.getQuantity();
-                            sftjmap.put(wp.getCompanyid() + "_zjts", temp);
+                            sftjmap.put(wp.getPhoto() + "_zjts", temp);
                         }
                     }
 
                 }
-
+//                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(wp.getId().endsWith("GDC") && InitialRunner.gp_sqmap.containsKey(wp.getId()))
+//                    {
+//                        List<Square> sqls=InitialRunner.gp_sqmap.get(wp.getId());
+//                        for(Square sq:sqls)
+//                        {
+//                            if(sq.getTypes().equals(ZC))
+//                            {
+//                                if (StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid() + "_zc_zjts")) {
+//
+//                                    double temp = sftjmap.get(wp.getCompanyid() + "_zc_zjts");
+//                                    if(InitialRunner.sq_nbqmap.containsKey(sq.getId()))
+//                                    {
+//                                        List<Inverter> nbqls=InitialRunner.sq_nbqmap.get(sq.getId());
+//                                        temp = temp + nbqls.size();
+//                                    }
+//
+//                                    sftjmap.put(wp.getCompanyid() + "_zc_zjts", temp);
+//                                } else {
+//                                    double temp = wp.getCapacity();
+//                                    sftjmap.put(wp.getCompanyid() + "_zc_zjts", temp);
+//                                }
+//                            }else
+//                            {
+//                                if (StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid() + "_jz_zjts")) {
+//
+//                                    double temp = sftjmap.get(wp.getCompanyid() + "_jz_zjts");
+//                                    if(InitialRunner.sq_nbqmap.containsKey(sq.getId()))
+//                                    {
+//                                        List<Inverter> nbqls=InitialRunner.sq_nbqmap.get(sq.getId());
+//                                        temp = temp + nbqls.size();
+//                                    }
+//                                    sftjmap.put(wp.getCompanyid() + "_jz_zjts", temp);
+//                                } else {
+//                                    double temp = wp.getCapacity();
+//                                    sftjmap.put(wp.getCompanyid() + "_jz_zjts", temp);
+//                                }
+//                            }
+//                        }
+//                    }
+//                    else
+//                    {
+//
+//                        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(); ) {