修改支路代码，修改公司区域安全天数代码

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/RegionCalreService.java

@@ -51,17 +51,17 @@ public class RegionCalreService  {
             points.add(cp2Point);
         });
         rgls.stream().forEach(company->{
-            ProBasicPowerstationPoint rg0Point = companypointmap.get(company.getId()+"0").get(ContantXk.AQTS);
-            ProBasicPowerstationPoint rg1Point = companypointmap.get(company.getId()+"-1").get(ContantXk.AQTS);
-            ProBasicPowerstationPoint rg2Point = companypointmap.get(company.getId()+"-2").get(ContantXk.AQTS);
+            ProBasicPowerstationPoint rg0Point = regionpointmap.get(company.getId()+"0").get(ContantXk.AQTS);
+            ProBasicPowerstationPoint rg1Point = regionpointmap.get(company.getId()+"-1").get(ContantXk.AQTS);
+            ProBasicPowerstationPoint rg2Point = regionpointmap.get(company.getId()+"-2").get(ContantXk.AQTS);
             points.add(rg0Point);
             points.add(rg1Point);
             points.add(rg2Point);
         });
         egls.stream().forEach(company->{
-            ProBasicPowerstationPoint eg0Point = companypointmap.get(company.getId()+"0").get(ContantXk.AQTS);
-            ProBasicPowerstationPoint eg1Point = companypointmap.get(company.getId()+"-1").get(ContantXk.AQTS);
-            ProBasicPowerstationPoint eg2Point = companypointmap.get(company.getId()+"-2").get(ContantXk.AQTS);
+            ProBasicPowerstationPoint eg0Point = grouppointmap.get(company.getId()+"0").get(ContantXk.AQTS);
+            ProBasicPowerstationPoint eg1Point = grouppointmap.get(company.getId()+"-1").get(ContantXk.AQTS);
+            ProBasicPowerstationPoint eg2Point = grouppointmap.get(company.getId()+"-2").get(ContantXk.AQTS);
             points.add(eg0Point);
             points.add(eg1Point);
             points.add(eg2Point);

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProEconTestingPointServiceImpl.java

@@ -500,10 +500,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
         List<ProBasicEquipmentPoint> allpoints = new ArrayList<>();
 
-//        List<ProEconTestingPoint> fdls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("F") || i.getTypeId().equals(FJC)).collect(Collectors.toList());
+        List<ProEconTestingPoint> fdls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("F") || i.getTypeId().equals(FJC)).collect(Collectors.toList());
 
-//        List<ProEconTestingPoint> gfls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("G") || i.getTypeId().equals("zl") || i.getTypeId().equals(GFC)).collect(Collectors.toList());
-        List<ProEconTestingPoint> gfls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("zl") ).collect(Collectors.toList());
+        List<ProEconTestingPoint> gfls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("G") || i.getTypeId().equals("zl") || i.getTypeId().equals(GFC)).collect(Collectors.toList());
+//        List<ProEconTestingPoint> gfls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("zl") ).collect(Collectors.toList());
 
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 
@@ -511,13 +511,13 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 continue;
             }
 
-            if (wp.getSpare4().equals("1")){
-                continue;
-            }
+//            if (wp.getSpare4().equals("1")){
+//                continue;
+//            }
 
             List<ProEconTestingPoint> ls = null;
             if (wp.getId().indexOf("FDC") >= 0) {
-//                ls = fdls;
+                ls = fdls;
 
             } else {
                 ls = gfls;
@@ -536,11 +536,11 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                     if (wt.getSpare1().contains("WT")){
                         continue;
                     }
-
-                    for (ProBasicBranch br : brls){
-                        if (!(br.getInteverId().equals(wt.getId()))){
-                            continue;
-                        }
+//
+//                    for (ProBasicBranch br : brls){
+//                        if (!(br.getInteverId().equals(wt.getId()))){
+//                            continue;
+//                        }
 
 
 
@@ -643,14 +643,16 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         }
 
                         sb = new StringBuilder();
-                        sb.append(wt.getName()).append(br.getName().substring(br.getName().length()-5)).append(stp.getName());
+                        sb.append(wt.getName()).append(stp.getName());
+//                        sb.append(wt.getName()).append(br.getName().substring(br.getName().length()-5)).append(stp.getName());
                         po.setName(String.valueOf(sb));
                         po.setModel(wt.getModelId());
                         po.setModelId(wt.getModelId());
-                        po.setWindturbineId(br.getId());
+                        po.setWindturbineId(wt.getId());
+//                        po.setWindturbineId(br.getId());
                         po.setUniformCode(stp.getUniformCode());
                         po.setTypeId(stp.getTypeId());
-                        po.setWindpowerstationId(wt.getId());
+                        po.setWindpowerstationId(wt.getWindpowerstationId());
                         po.setLogicalUnitId(ls.get(i).getLogicalUnitId());
                         po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
                         points.add(po);
@@ -661,10 +663,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
 
             }
-//            }
-                }
-
             }
+//                }
+
+//            }
         }
         return allpoints;