修改测点生成规则2

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/PointGenerateService.java

@@ -110,7 +110,7 @@ public class PointGenerateService {
                 gssb = new StringBuilder();
                 gssb.append("JSFW.").append(c.getId()).append("_");
                 stationpoint = new Windpowerstationpointnew();
-                stationpoint.setCode(gssb.toString() + "XXXX_XX_XX_XX_XXX_" + p.getUniformcode());
+                stationpoint.setCode(gssb.toString() + "XXXX_XX_XX_XX_XXX_" + p.getPoint());
                 stationpoint.setName(c.getName() + p.getName());
                 stationpoint.setUniformcode(p.getUniformcode());
                 stationpoint.setWindpowerstationid(c.getId());
@@ -149,9 +149,10 @@ public class PointGenerateService {
                 if (null == list2 || list2.size() <= 0) {
                     //"JSFW.SX_JN_XXXX_XX_XX_XX_XXX_CI0144"	"山西限电停机台数（明细）"
 
-                    qusb.append("JSFW.").append(r.getId()).append("_");
+                    qusb.append("JSFW.").append(c.getId()).append("_");
+                    qusb.append(r.getId()).append("_");
                     stationpoint = new Windpowerstationpointnew();
-                    stationpoint.setCode(gssb.toString() + "XXXX_XX_XX_XX_XXX_" + p.getPoint());
+                    stationpoint.setCode(gssb.toString() + "XX_XX_XX_XXX_" + p.getPoint());
                     stationpoint.setName(c.getName() + p.getName());
                     stationpoint.setUniformcode(p.getUniformcode());
                     stationpoint.setWindpowerstationid(r.getId());
@@ -165,7 +166,7 @@ public class PointGenerateService {
                         //"JSFW.SX_JN_SXG_XX_XX_XX_XXX_CI0144"	"山西光伏限电停机台数（明细）"
                         //"JSFW.SX_JN_SXF_XX_XX_XX_XXX_CI0144"	"山西风场限电停机台数（明细）"
                         StringBuilder qugfsb = new StringBuilder(qusb);
-                        qugfsb.append(r.getId()).append(gf)
+                        qugfsb.append(gf)
                                 .append("_XX_XX_XX_XXX_")
                                 .append(p.getPoint());
                         stationpoint = new Windpowerstationpointnew();
@@ -218,7 +219,7 @@ public class PointGenerateService {
                         projectsb.append("P")
                                 .append(pnum);
 
-                        stationpoint.setCode(projectsb.toString() + "_XX_XXX_" + p.getUniformcode());
+                        stationpoint.setCode(projectsb.toString() + "_XX_XXX_" + p.getPoint());
                         stationpoint.setName(project.getName() + p.getName());
                         stationpoint.setUniformcode(p.getUniformcode());
                         stationpoint.setWindpowerstationid(project.getId());
@@ -293,7 +294,7 @@ public class PointGenerateService {
 
                     //BHB3FJJSFW.SX_JN_BHB3F_JS_P1_L30_001_CI0060
                     //SYGFJSFW.SX_JN_SYG_JS_P2_L3_NBQ0061_CI0174
-                    testing.setCode(stationsb.toString() + p.getUniformcode());
+                    testing.setCode(stationsb.toString() + p.getPoint());
                     testing.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FJJSFW" : "GFJSFW"));
                 } else if ("fjjcd".equals(p.getType())) {
                     testing.setCode("INITIAL");