|
@@ -94,13 +94,6 @@ public class PointGenerateService {
|
|
|
}
|
|
|
|
|
|
|
|
|
- private String codeRules(){
|
|
|
-
|
|
|
-
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
|
|
|
private List<Windpowerstationpointnew> fjd(Standardpoint p, List<Companys> companysList) {
|
|
|
List<Windpowerstationpointnew> stationList = new ArrayList<>();
|
|
@@ -215,6 +208,7 @@ public class PointGenerateService {
|
|
|
stationpoint.setCode(stationsb.toString() + "XX_XX_XXX_" + p.getUniformcode());
|
|
|
stationpoint.setName(station.getName() + p.getName());
|
|
|
stationpoint.setUniformcode(p.getUniformcode());
|
|
|
+ stationpoint.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
|
|
|
stationList.add(stationpoint);
|
|
|
|
|
|
List<Project> projectList = projectService.getList(station.getId());
|
|
@@ -236,6 +230,7 @@ public class PointGenerateService {
|
|
|
stationpoint.setCode(projectsb.toString()+"_XX_XXX_"+p.getUniformcode());
|
|
|
stationpoint.setName(project.getName() + p.getName());
|
|
|
stationpoint.setUniformcode(p.getUniformcode());
|
|
|
+ stationpoint.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
|
|
|
stationList.add(stationpoint);
|
|
|
|
|
|
List<Line> lineList = lineService.getList(project.getId());
|
|
@@ -257,6 +252,7 @@ public class PointGenerateService {
|
|
|
stationpoint.setCode(linesb.toString());
|
|
|
stationpoint.setName(l.getName() + p.getName());
|
|
|
stationpoint.setUniformcode(p.getUniformcode());
|
|
|
+ stationpoint.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
|
|
|
stationList.add(stationpoint);
|
|
|
|
|
|
}
|
|
@@ -290,9 +286,9 @@ public class PointGenerateService {
|
|
|
testing = new Windturbinetestingpointnew();
|
|
|
//fjjs
|
|
|
//fjjcd
|
|
|
+ String substaion = station.getId().substring(0, station.getId().indexOf("_"));
|
|
|
if ("fjjs".equals(p.getType())) {
|
|
|
StringBuilder stationsb = new StringBuilder();
|
|
|
- String substaion = station.getId().substring(0, station.getId().indexOf("_"));
|
|
|
stationsb.append(substaion).append(station.getId().endsWith("_FDC") ? "FJJSFW." : "GFJSFW.");
|
|
|
stationsb.append("SX_JN_").append(substaion);
|
|
|
stationsb.append(station.getId().endsWith("_FDC") ? "F" : "G").append("_JS_");
|
|
@@ -306,8 +302,10 @@ 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.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FJJSFW" : "GFJSFW"));
|
|
|
} else if ("fjjcd".equals(p.getType())) {
|
|
|
testing.setCode("INITIAL");
|
|
|
+ testing.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FJ" : "GF"));
|
|
|
}
|
|
|
|
|
|
testing.setName(w.getName() + p.getName());
|