优化

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

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

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

@@ -259,7 +259,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                     StringBuilder sbtable = new StringBuilder();
 
-
+                    sbtable.append("NEM_");
                     sbtable.append(sba).append("JSFW.");
                     sbtable.append(sb);
                     ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
@@ -356,7 +356,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                     StringBuilder sbtable = new StringBuilder();
 
-
+                    sbtable.append("NEM_");
                     sbtable.append(sba).append("JSFW.");
                     sbtable.append(sb);
                     ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
@@ -454,9 +454,11 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
 
                     if (p.getTypeId().indexOf(AGCC) >= 0 ) {
+                        sbtable.append("NEM_");
                         sbtable.append(sba).append("JSFW.");
                         sbtable.append(sb);
                     } else {
+                        sbtable.append("NEM_");
                         sbtable.append(sba).append(".");
                         sbtable.append(sb);
                     }
@@ -593,9 +595,11 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
 
                         if (stp.getUniformCode().indexOf("AI") < 0 && stp.getUniformCode().indexOf("DI") < 0) {
+                            sbtable.append("NEM_");
                             sbtable.append(sba).append("JSFW.");
                             sbtable.append(sb);
                         } else {
+                            sbtable.append("NEM_");
                             sbtable.append(sba).append(".");
                             sbtable.append(sb);
                         }
@@ -680,6 +684,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                     StringBuilder sb = new StringBuilder();
                     StringBuilder sbtable = new StringBuilder();
+                    sbtable.append("NEM_");
                     sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
                     sb.append(String.valueOf(sba));
                     sb.append("XXXX_XXX_X_XX_XX_XXXX_");
@@ -687,6 +692,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                     sb.append("CI");
                     sb.append(stp.getNemCode());
 
+
                     sbtable.append("JSFW.");
                     sbtable.append(sb);
 
@@ -737,6 +743,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                     ProEconTestingPoint stp = fdpointls.get(i);
                     StringBuilder sb = new StringBuilder();
                     StringBuilder sbtable = new StringBuilder();
+                    sbtable.append("NEM_");
                     sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
                     sb.append(String.valueOf(sba));
                     sb.append(re.getId().substring(0, re.getId().indexOf("_"))).append("_XXXX_XXX_F_XX_XX_XXXX_");
@@ -795,6 +802,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                     sb.append("CI");
                     sb.append(stp.getNemCode());
 
+                    sbtable.append("NEM_");
                     sbtable.append("JSFW.");
                     sbtable.append(sb);
 
@@ -844,6 +852,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                             StringBuilder sb = new StringBuilder();
                             StringBuilder sbtable = new StringBuilder();
+                            sbtable.append("NEM_");
                             sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
 
                             sb.append(String.valueOf(sba));
@@ -852,6 +861,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                             sb.append("CI");
                             sb.append(stp.getNemCode());
 
+
                             sbtable.append("JSFW.");
                             sbtable.append(sb);
 
@@ -899,6 +909,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                             ProEconTestingPoint stp = fdpointls.get(i);
                             StringBuilder sb = new StringBuilder();
                             StringBuilder sbtable = new StringBuilder();
+                            sbtable.append("NEM_");
                             sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
                             sb.append(String.valueOf(sba));
                             sb.append("XXX_F_XX_XX_XXXX_");
@@ -906,6 +917,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                             sb.append("CI");
                             sb.append(stp.getNemCode());
 
+
                             sbtable.append("JSFW.");
                             sbtable.append(sb);
 
@@ -959,6 +971,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                             sb.append("CI");
                             sb.append(stp.getNemCode());
 
+                            sbtable.append("NEM_");
                             sbtable.append("JSFW.");
                             sbtable.append(sb);
 
@@ -1059,6 +1072,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
             StringBuilder sbtable = new StringBuilder();
 
 
+            sbtable.append("NEM_");
             sbtable.append(sba).append("JSFW.");
             sbtable.append(sb);
 
@@ -1131,7 +1145,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                     StringBuilder sbtable = new StringBuilder();
 
-
+                    sbtable.append("NEM_");
                     sbtable.append(sba).append("JSFW.");
                     sbtable.append(sb);
 
@@ -1218,6 +1232,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         if("ln".equals(stp.getTypeId())){
                             sbtable.append("INITIAL");
                         }else {
+                            sbtable.append("NEM_");
                             sbtable.append(sba).append("JSFW.");
                             sbtable.append(sb);
                         }
@@ -1235,7 +1250,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         po.setWindpowerstationId(ln.getId());
                         po.setUniformCode(stp.getUniformCode());
                         po.setTypeId(stp.getTypeId());
-                        po.setRealtimeId(sba.append("JSFW").toString());
+                        po.setRealtimeId("INITIAL".equals(sbtable) ? String.valueOf(sbtable).substring(0,sbtable.indexOf(".")):"");
 
                         points.add(po);
                     }