修改部分

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconTestingPointController.java

@@ -121,10 +121,11 @@ public class ProEconTestingPointController {
                            @RequestParam(value = "type", required = false) String type) {
 
         try {
-           String[] stations =  station.split(",");
-            Arrays.stream(stations).forEach(i->{
-                asysncTestService.generatePoint(i, points, type);
-            });
+//           String[] stations =  station.split(",");
+//            Arrays.stream(stations).forEach(i->{
+//
+//            });
+            asysncTestService.generatePoint(station,points, type);
 
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -533,9 +533,9 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                 for (ProBasicEquipment wt : wtls) {
 
-                    if (wt.getSpare1().contains("WT")){
-                        continue;
-                    }
+//                    if (wt.getSpare1().contains("WT")){
+//                        continue;
+//                    }
 //
 //                    for (ProBasicBranch br : brls){
 //                        if (!(br.getInteverId().equals(wt.getId()))){
@@ -917,10 +917,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                 for (int i = 0; i < fdpointls.size(); i++) {
 
-//                    List<ProBasicPowerstation> groupFCRegion = CacheContext.wpmapGroupFCRegion.get(re.getId());
-//                    if(null == groupFCRegion || groupFCRegion.size()<=0){
-//                        break;
-//                    }
+                    List<ProBasicPowerstation> groupFCRegion = CacheContext.wpmapGroupFCRegion.get(re.getId());
+                    if(null == groupFCRegion || groupFCRegion.size()<=0){
+                        break;
+                    }
 
                     sba = new StringBuilder();
 
@@ -971,10 +971,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 points = new ArrayList<>();
                 for (int i = 0; i < gfpointls.size(); i++) {
 
-//                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCRegion.get(re.getId());
-//                    if(null == groupGCRegion || groupGCRegion.size()<=0){
-//                        break;
-//                    }
+                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCRegion.get(re.getId());
+                    if(null == groupGCRegion || groupGCRegion.size()<=0){
+                        break;
+                    }
 
                     ProEconTestingPoint stp = gfpointls.get(i);
                     StringBuilder sb = new StringBuilder();
@@ -1087,10 +1087,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         sba.append(cs.getId().substring(0, cs.getId().lastIndexOf("_"))).append("_");
                         for (int i = 0; i < fdpointls.size(); i++) {
 
-//                            List<ProBasicPowerstation> groupFCCompany = CacheContext.wpmapGroupFCCompany.get(cs.getId());
-//                            if(null == groupFCCompany || groupFCCompany.size()<=0){
-//                                break;
-//                            }
+                            List<ProBasicPowerstation> groupFCCompany = CacheContext.wpmapGroupFCCompany.get(cs.getId());
+                            if(null == groupFCCompany || groupFCCompany.size()<=0){
+                                break;
+                            }
                             ProEconTestingPoint stp = fdpointls.get(i);
                             StringBuilder sb = new StringBuilder();
                             StringBuilder sbtable = new StringBuilder();
@@ -1142,10 +1142,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         points = new ArrayList<>();
                         for (int i = 0; i < gfpointls.size(); i++) {
 
-//                            List<ProBasicPowerstation> groupGCCompany = CacheContext.wpmapGroupGCCompany.get(cs.getId());
-//                            if(null == groupGCCompany || groupGCCompany.size()<=0){
-//                                break;
-//                            }
+                            List<ProBasicPowerstation> groupGCCompany = CacheContext.wpmapGroupGCCompany.get(cs.getId());
+                            if(null == groupGCCompany || groupGCCompany.size()<=0){
+                                break;
+                            }
                             ProEconTestingPoint stp = gfpointls.get(i);
                             StringBuilder sb = new StringBuilder();
                             StringBuilder sbtable = new StringBuilder();
@@ -1191,173 +1191,173 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
             }
         }
 
-//        List<ProBasicEnergyGroup> groups = proBasicEnergyGroupService.list();
-//
-//        if (!groups.isEmpty()){
-//
-//            for (ProBasicEnergyGroup group : groups) {
-//
-//                if (group.getId().equals("JK_JT")){
-//                    continue;
-//                }
-//                StringBuilder sba = new StringBuilder();
-//                sba.append(group.getId().substring(0, group.getId().indexOf("_"))).append("_");
-///********************************************区域公司测点**************************************************/
-//
-//
-//                List<ProBasicPowerstationPoint> points = new ArrayList<>();
-//                for (int i = 0; i < pointls.size(); i++) {
-//                    ProEconTestingPoint stp = pointls.get(i);
-//                    StringBuilder sb = new StringBuilder();
-//                    StringBuilder sbtable = new StringBuilder();
-//                    sbtable.append("NEM_");
-//                    sbtable.append(group.getId().substring(0, group.getId().indexOf("_")));
-//                    sb.append(String.valueOf(sba));
-//                    sb.append("XXXX_XXX_X_XX_XX_XXXX_");
-//                    sb.append(stp.getTypeId().toUpperCase()).append("_"); //toUpperCase-转大写
-//                    sb.append("CI");
-//                    sb.append(stp.getNemCode());
-//
-//
-//                    sbtable.append("JSFW.");
-//                    sbtable.append(sb);
-//
-//                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
-//                    po.setId(StringUtils.getUUID());
-//                    po.setNemCode(String.valueOf(sbtable));
-//                    sb = new StringBuilder();
-//                    sb.append(group.getName()).append(stp.getName());
-//                    po.setName(String.valueOf(sb));
-//                    po.setModel(null);
-//                    po.setModelId(null);
-//
-//                    StringBuilder tempsb = new StringBuilder();
-//
-//                    if (StringUtils.notEmp(group.getNemCode())) {
-//                        tempsb.append(group.getNemCode()).append("0");
-//                    } else {
-//                        tempsb.append("0");
-//                    }
-//
-//                    po.setWindpowerstationId(String.valueOf(tempsb));
-//                    po.setUniformCode(stp.getUniformCode());
-//                    po.setTypeId(stp.getTypeId());
-//
-//                    po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
-//
-//
-//                    points.add(po);
-//                }
-//
-//                allpoints.addAll(points);
-///*******************************************区域公司测点*******************************************************/
-///********************************************风电场公司测点**************************************************/
-//                points = new ArrayList<>();
-//
-//                for (int i = 0; i < fdpointls.size(); i++) {
-//
-//                    List<ProBasicPowerstation> groupFCRegion = CacheContext.wpmapGroupFCgroup.get(group.getId());
-//                    if(null == groupFCRegion || groupFCRegion.size()<=0){
-//                        break;
-//                    }
-//
-//                    sba = new StringBuilder();
-//
-//                    ProEconTestingPoint stp = fdpointls.get(i);
-//                    StringBuilder sb = new StringBuilder();
-//                    StringBuilder sbtable = new StringBuilder();
-//                    sbtable.append("NEM_");
-//                    sbtable.append(group.getId().substring(0, group.getId().indexOf("_")));
-//                    sb.append(String.valueOf(sba));
-//                    sb.append(group.getId().substring(0, group.getId().indexOf("_"))).append("_XXXX_XXX_F_XX_XX_XXXX_");
-//                    sb.append(stp.getTypeId().toUpperCase()).append("_");
-//                    sb.append("CI");
-//                    sb.append(stp.getNemCode());
-//
-//                    sbtable.append("JSFW.");
-//                    sbtable.append(sb);
-//
-//                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
-//                    po.setId(StringUtils.getUUID());
-////                            po.setNemCode(V2Config.getInitialcode());
-//                    po.setNemCode(String.valueOf(sbtable));
-//                    sb = new StringBuilder();
-//                    sb.append(group.getName()).append("风电").append(stp.getName());
-//                    po.setName(String.valueOf(sb));
-//                    po.setModel(null);
-//                    po.setModelId(null);
-//
-//                    StringBuilder tempsb = new StringBuilder();
-//                    if (StringUtils.notEmp(group.getNemCode())) {
-//                        tempsb.append(group.getNemCode()).append("-1");
-//                    } else {
-//                        tempsb.append("-1");
-//                    }
-//                    po.setWindpowerstationId(String.valueOf(tempsb));
-//                    po.setUniformCode(stp.getUniformCode());
-//                    po.setTypeId(stp.getTypeId());
-//                    po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
-//                    points.add(po);
-//                }
-//
-//                allpoints.addAll(points);
-//
-//                /*******************************************风电测点生成*******************************************************/
-//
-//
-///*********************************************光伏测点生成*****************************************************/
-//
-//                points = new ArrayList<>();
-//                for (int i = 0; i < gfpointls.size(); i++) {
-//
-//                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCgroup.get(group.getId());
-//                    if(null == groupGCRegion || groupGCRegion.size()<=0){
-//                        break;
-//                    }
-//
-//                    ProEconTestingPoint stp = gfpointls.get(i);
-//                    StringBuilder sb = new StringBuilder();
-//                    StringBuilder sbtable = new StringBuilder();
-//                    sbtable.append("NEM_");
-//                    sbtable.append(group.getId().substring(0, group.getId().indexOf("_")));
-//                    sb.append(String.valueOf(sba));
-//                    sb.append(group.getId().substring(0, group.getId().indexOf("_"))).append("_XXXX_XXX_G_XX_XX_XXXX_");
-//                    sb.append(stp.getTypeId().toUpperCase()).append("_");
-//                    sb.append("CI");
-//                    sb.append(stp.getNemCode());
-//
-//
-//                    sbtable.append("JSFW.");
-//                    sbtable.append(sb);
-//
-//                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
-//                    po.setId(StringUtils.getUUID());
-////                            po.setNemCode(V2Config.getInitialcode());
-//                    po.setNemCode(String.valueOf(sbtable));
-//                    sb = new StringBuilder();
-//                    sb.append(group.getName()).append("光伏").append(stp.getName());
-//                    po.setName(String.valueOf(sb));
-//                    po.setModel(null);
-//                    po.setModelId(null);
-//                    StringBuilder tempsb = new StringBuilder();
-//
-//                    if (StringUtils.notEmp(group.getNemCode())) {
-//                        tempsb.append(group.getNemCode()).append("-2");
-//                    } else {
-//                        tempsb.append("-2");
-//                    }
-//
-//                    po.setWindpowerstationId(String.valueOf(tempsb));
-//                    po.setUniformCode(stp.getUniformCode());
-//                    po.setTypeId(stp.getTypeId());
-//                    po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
-//                    points.add(po);
-//                }
-//
-//                allpoints.addAll(points);
-//
-//            }
-//        }
+        List<ProBasicEnergyGroup> groups = proBasicEnergyGroupService.list();
+
+        if (!groups.isEmpty()){
+
+            for (ProBasicEnergyGroup group : groups) {
+
+                if (group.getId().equals("JK_JT")){
+                    continue;
+                }
+                StringBuilder sba = new StringBuilder();
+                sba.append(group.getId().substring(0, group.getId().indexOf("_"))).append("_");
+/********************************************区域公司测点**************************************************/
+
+
+                List<ProBasicPowerstationPoint> points = new ArrayList<>();
+                for (int i = 0; i < pointls.size(); i++) {
+                    ProEconTestingPoint stp = pointls.get(i);
+                    StringBuilder sb = new StringBuilder();
+                    StringBuilder sbtable = new StringBuilder();
+                    sbtable.append("NEM_");
+                    sbtable.append(group.getId().substring(0, group.getId().indexOf("_")));
+                    sb.append(String.valueOf(sba));
+                    sb.append("XXXX_XXX_X_XX_XX_XXXX_");
+                    sb.append(stp.getTypeId().toUpperCase()).append("_"); //toUpperCase-转大写
+                    sb.append("CI");
+                    sb.append(stp.getNemCode());
+
+
+                    sbtable.append("JSFW.");
+                    sbtable.append(sb);
+
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                    po.setId(StringUtils.getUUID());
+                    po.setNemCode(String.valueOf(sbtable));
+                    sb = new StringBuilder();
+                    sb.append(group.getName()).append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+
+                    StringBuilder tempsb = new StringBuilder();
+
+                    if (StringUtils.notEmp(group.getNemCode())) {
+                        tempsb.append(group.getNemCode()).append("0");
+                    } else {
+                        tempsb.append("0");
+                    }
+
+                    po.setWindpowerstationId(String.valueOf(tempsb));
+                    po.setUniformCode(stp.getUniformCode());
+                    po.setTypeId(stp.getTypeId());
+
+                    po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
+
+
+                    points.add(po);
+                }
+
+                allpoints.addAll(points);
+/*******************************************区域公司测点*******************************************************/
+/********************************************风电场公司测点**************************************************/
+                points = new ArrayList<>();
+
+                for (int i = 0; i < fdpointls.size(); i++) {
+
+                    List<ProBasicPowerstation> groupFCRegion = CacheContext.wpmapGroupFCgroup.get(group.getId());
+                    if(null == groupFCRegion || groupFCRegion.size()<=0){
+                        break;
+                    }
+
+                    sba = new StringBuilder();
+
+                    ProEconTestingPoint stp = fdpointls.get(i);
+                    StringBuilder sb = new StringBuilder();
+                    StringBuilder sbtable = new StringBuilder();
+                    sbtable.append("NEM_");
+                    sbtable.append(group.getId().substring(0, group.getId().indexOf("_")));
+                    sb.append(String.valueOf(sba));
+                    sb.append(group.getId().substring(0, group.getId().indexOf("_"))).append("_XXXX_XXX_F_XX_XX_XXXX_");
+                    sb.append(stp.getTypeId().toUpperCase()).append("_");
+                    sb.append("CI");
+                    sb.append(stp.getNemCode());
+
+                    sbtable.append("JSFW.");
+                    sbtable.append(sb);
+
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                    po.setId(StringUtils.getUUID());
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
+                    sb = new StringBuilder();
+                    sb.append(group.getName()).append("风电").append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+
+                    StringBuilder tempsb = new StringBuilder();
+                    if (StringUtils.notEmp(group.getNemCode())) {
+                        tempsb.append(group.getNemCode()).append("-1");
+                    } else {
+                        tempsb.append("-1");
+                    }
+                    po.setWindpowerstationId(String.valueOf(tempsb));
+                    po.setUniformCode(stp.getUniformCode());
+                    po.setTypeId(stp.getTypeId());
+                    po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
+                    points.add(po);
+                }
+
+                allpoints.addAll(points);
+
+                /*******************************************风电测点生成*************************************************/
+
+
+                /*********************************************光伏测点生成***********************************************/
+
+                points = new ArrayList<>();
+                for (int i = 0; i < gfpointls.size(); i++) {
+
+                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCgroup.get(group.getId());
+                    if(null == groupGCRegion || groupGCRegion.size()<=0){
+                        break;
+                    }
+
+                    ProEconTestingPoint stp = gfpointls.get(i);
+                    StringBuilder sb = new StringBuilder();
+                    StringBuilder sbtable = new StringBuilder();
+                    sbtable.append("NEM_");
+                    sbtable.append(group.getId().substring(0, group.getId().indexOf("_")));
+                    sb.append(String.valueOf(sba));
+                    sb.append(group.getId().substring(0, group.getId().indexOf("_"))).append("_XXXX_XXX_G_XX_XX_XXXX_");
+                    sb.append(stp.getTypeId().toUpperCase()).append("_");
+                    sb.append("CI");
+                    sb.append(stp.getNemCode());
+
+
+                    sbtable.append("JSFW.");
+                    sbtable.append(sb);
+
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                    po.setId(StringUtils.getUUID());
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
+                    sb = new StringBuilder();
+                    sb.append(group.getName()).append("光伏").append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+                    StringBuilder tempsb = new StringBuilder();
+
+                    if (StringUtils.notEmp(group.getNemCode())) {
+                        tempsb.append(group.getNemCode()).append("-2");
+                    } else {
+                        tempsb.append("-2");
+                    }
+
+                    po.setWindpowerstationId(String.valueOf(tempsb));
+                    po.setUniformCode(stp.getUniformCode());
+                    po.setTypeId(stp.getTypeId());
+                    po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
+                    points.add(po);
+                }
+
+                allpoints.addAll(points);
+
+            }
+        }
 
 
         /*********************************************场站、项目、线路测点生成*****************************************************/
@@ -1658,7 +1658,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
             for (ProBasicEnergyGroup group : groups) {
 
-                if (group.getId().equals("JK_JT")){
+                if (group.getId().equals("GJNY_JT")){
                     continue;
                 }
                 StringBuilder sba = new StringBuilder();