修改测点生成规则

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/PointGenerateController.java

@@ -2,17 +2,10 @@ package com.gyee.backconfig.controller;
 
 
 import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.Project;
-import com.gyee.backconfig.model.auto.Standardpoint;
 import com.gyee.backconfig.service.PointGenerateService;
-import com.gyee.backconfig.service.auto.*;
-import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import java.util.List;
-
 /**
  * <p>
  * 前端控制器

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

@@ -49,7 +49,7 @@ public class PointGenerateService {
 
 
     public int addGeneratePoint(String[] points) {
-        int num  = 0;
+        int num = 0;
 
         List<Standardpoint> pointList = standardpointService.list(points);
         List<Companys> companysList = companysService.getCompanysByidAndRid("");
@@ -61,8 +61,8 @@ public class PointGenerateService {
                 List<Windpowerstationpointnew> staionList = fjd(p, companysList);
                 for (Windpowerstationpointnew i : staionList) {
                     boolean b = windpowerstationpointnewService.addOrUpdate(i);
-                    if (!b){
-                        logger.error( i.getCode()+"测点插入失败");
+                    if (!b) {
+                        logger.error(i.getCode() + "测点插入失败");
                         num++;
                     }
                 }
@@ -75,11 +75,11 @@ public class PointGenerateService {
                     List<Region> regionList = regionService.getReginBycode(c.getCapacityunit());
                     for (Region r : regionList) {
                         List<Windpowerstation> windpowerstationList = windpowerstationService.getList(r.getCompanyid());
-                        List<Windturbinetestingpointnew> testingList = czd(p, windpowerstationList);
+                        List<Windturbinetestingpointnew> testingList = czd(p, windpowerstationList, r);
                         for (Windturbinetestingpointnew i : testingList) {
                             boolean b = windturbinetestingpointnewService.addOrUpdate(i);
-                            if (!b){
-                                logger.error( i.getCode()+"测点插入失败");
+                            if (!b) {
+                                logger.error(i.getCode() + "测点插入失败");
                                 num++;
                             }
                         }
@@ -89,12 +89,10 @@ public class PointGenerateService {
 
         }
 
-
         return num;
     }
 
 
-
     private List<Windpowerstationpointnew> fjd(Standardpoint p, List<Companys> companysList) {
         List<Windpowerstationpointnew> stationList = new ArrayList<>();
 
@@ -105,17 +103,12 @@ public class PointGenerateService {
         gflist.add("F");
 
         for (Companys c : companysList) {
-
-
-
-
-
             StringBuilder gssb = null;
             List<Windpowerstationpointnew> list1 = windpowerstationpointnewService.getStationpointByUniformcode(c.getId(), p.getUniformcode());
             if (null == list1 || list1.size() <= 0) {
                 //"JSFW.QY_JN_XXXX_XX_XX_XX_XXX_CI0144"	"区域限电停机台数（明细）"
                 gssb = new StringBuilder();
-                gssb.append("JSFW.").append(c.getId()).append("_JN_");
+                gssb.append("JSFW.").append(c.getId()).append("_");
                 stationpoint = new Windpowerstationpointnew();
                 stationpoint.setCode(gssb.toString() + "XXXX_XX_XX_XX_XXX_" + p.getUniformcode());
                 stationpoint.setName(c.getName() + p.getName());
@@ -126,21 +119,20 @@ public class PointGenerateService {
             }
 
 
-
-            for (String gf: gflist){
-                List<Windpowerstationpointnew> list1df = windpowerstationpointnewService.getStationpointByUniformcode(c.getId()+"_"+gf, p.getUniformcode());
+            for (String gf : gflist) {
+                List<Windpowerstationpointnew> list1df = windpowerstationpointnewService.getStationpointByUniformcode(c.getId() + "_" + gf, p.getUniformcode());
                 if (null == list1df || list1df.size() <= 0) {
                     //"JSFW.QY_JN_QYG_XX_XX_XX_XXX_CI0144"	"区域光伏限电停机台数（明细）"
                     //"JSFW.QY_JN_QYF_XX_XX_XX_XXX_CI0144"	"区域风场限电停机台数（明细）"
                     StringBuilder gsgfsb = new StringBuilder(gssb);
                     gsgfsb.append(c.getId()).append(gf)
                             .append("_XX_XX_XX_XXX_")
-                            .append(p.getUniformcode());
+                            .append(p.getPoint());
                     stationpoint = new Windpowerstationpointnew();
                     stationpoint.setCode(gsgfsb.toString());
                     stationpoint.setName(c.getName() + p.getName());
                     stationpoint.setUniformcode(p.getUniformcode());
-                    stationpoint.setWindpowerstationid(c.getId()+"_"+gf);
+                    stationpoint.setWindpowerstationid(c.getId() + "_" + gf);
                     stationpoint.setRealtimeid("JSFW");
                     stationList.add(stationpoint);
                 }
@@ -153,13 +145,13 @@ public class PointGenerateService {
 
 
                 StringBuilder qusb = new StringBuilder();
-                List<Windpowerstationpointnew> list2 = windpowerstationpointnewService.getStationpointByUniformcode( r.getId(), p.getUniformcode());
+                List<Windpowerstationpointnew> list2 = windpowerstationpointnewService.getStationpointByUniformcode(r.getId(), p.getUniformcode());
                 if (null == list2 || list2.size() <= 0) {
                     //"JSFW.SX_JN_XXXX_XX_XX_XX_XXX_CI0144"	"山西限电停机台数（明细）"
 
-                    qusb.append("JSFW.").append(r.getId()).append("_JN_");
+                    qusb.append("JSFW.").append(r.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(r.getId());
@@ -167,7 +159,7 @@ public class PointGenerateService {
                     stationList.add(stationpoint);
                 }
 
-                for (String gf: gflist) {
+                for (String gf : gflist) {
                     List<Windpowerstationpointnew> list2df = windpowerstationpointnewService.getStationpointByUniformcode(r.getId() + "_" + gf, p.getUniformcode());
                     if (null == list2df || list2df.size() <= 0) {
                         //"JSFW.SX_JN_SXG_XX_XX_XX_XXX_CI0144"	"山西光伏限电停机台数（明细）"
@@ -175,7 +167,7 @@ public class PointGenerateService {
                         StringBuilder qugfsb = new StringBuilder(qusb);
                         qugfsb.append(r.getId()).append(gf)
                                 .append("_XX_XX_XX_XXX_")
-                                .append(p.getUniformcode());
+                                .append(p.getPoint());
                         stationpoint = new Windpowerstationpointnew();
                         stationpoint.setCode(qugfsb.toString());
                         stationpoint.setName(c.getName() + p.getName());
@@ -188,7 +180,6 @@ public class PointGenerateService {
                 }
 
 
-
                 List<Windpowerstation> windpowerstationList = windpowerstationService.getList(r.getCompanyid());
                 for (Windpowerstation station : windpowerstationList) {
                     List<Windpowerstationpointnew> list3 = windpowerstationpointnewService.getStationpointByUniformcode(station.getId(), p.getUniformcode());
@@ -198,14 +189,16 @@ public class PointGenerateService {
                     stationpoint = new Windpowerstationpointnew();
                     //BHBFCJSFW.SX_JN_BHBF_JS_XX_XX_XXX_CI0079
                     //SYGCJSFW.SX_JN_SYG_JS_XX_XX_XXX_CI0001
+                    //HSMFCJSFW.SX_JN_HSMF_JS_XX_XX_XXX_AI0002
 
+                    //场站测点
                     StringBuilder stationsb = new StringBuilder();
                     String substaion = station.getId().substring(0, station.getId().indexOf("_"));
                     stationsb.append(substaion).append(station.getId().endsWith("_FDC") ? "FCJSFW." : "GCJSFW.");
-                    stationsb.append("SX_JN_").append(substaion);
-                    stationsb.append(station.getId().endsWith("_FDC") ? "F" : "G").append("_JS_");
+                    stationsb.append(c.getId()).append("_").append(r.getId()).append("_").append(substaion);
+                    stationsb.append(station.getId().endsWith("_FDC") ? "F" : "G").append("_");
 
-                    stationpoint.setCode(stationsb.toString() + "XX_XX_XXX_" + p.getUniformcode());
+                    stationpoint.setCode(stationsb.toString() + "XX_XX_XXX_" + p.getPoint());
                     stationpoint.setName(station.getName() + p.getName());
                     stationpoint.setUniformcode(p.getUniformcode());
                     stationpoint.setWindpowerstationid(station.getId());
@@ -218,17 +211,14 @@ public class PointGenerateService {
                         if (null != list4 && list4.size() > 0) {
                             continue;
                         }
+                        //期次测点
                         stationpoint = new Windpowerstationpointnew();
-                        //BHBFCJSFW.SX_JN_BHBF_JS_P1_XX_XXX_CI0079
-                        //SYGCJSFW.SX_JN_SYG_JS_P1_XX_XXX_CI0001
                         StringBuilder projectsb = new StringBuilder(stationsb);
-
-
                         Integer pnum = Integer.valueOf(project.getId().substring(substaion.length(), project.getId().indexOf("_"))) * 1;
                         projectsb.append("P")
                                 .append(pnum);
 
-                        stationpoint.setCode(projectsb.toString()+"_XX_XXX_"+p.getUniformcode());
+                        stationpoint.setCode(projectsb.toString() + "_XX_XXX_" + p.getUniformcode());
                         stationpoint.setName(project.getName() + p.getName());
                         stationpoint.setUniformcode(p.getUniformcode());
                         stationpoint.setWindpowerstationid(project.getId());
@@ -243,13 +233,12 @@ public class PointGenerateService {
                                 continue;
                             }
                             stationpoint = new Windpowerstationpointnew();
-                            //BHBFCJSFW.SX_JN_BHBF_JS_P1_L3_XXX_CI0079
-                            //SYGCJSFW.SX_JN_SYG_JS_P1_L1_XXX_CI0001
+                            //线路测点
                             StringBuilder linesb = new StringBuilder(projectsb);
 
                             Integer lnum = Integer.valueOf(l.getId().substring(substaion.length(), project.getId().indexOf("_"))) * 1;
                             linesb.append("_L").append(lnum)
-                            .append("_XXX_").append(p.getUniformcode());
+                                    .append("_XXX_").append(p.getPoint());
 
                             stationpoint.setCode(linesb.toString());
                             stationpoint.setName(l.getName() + p.getName());
@@ -274,7 +263,7 @@ public class PointGenerateService {
      * @param windpowerstationList
      * @return
      */
-    private List<Windturbinetestingpointnew> czd(Standardpoint p, List<Windpowerstation> windpowerstationList) {
+    private List<Windturbinetestingpointnew> czd(Standardpoint p, List<Windpowerstation> windpowerstationList,Region region) {
         Windturbinetestingpointnew testing = null;
         List<Windturbinetestingpointnew> testingList = new ArrayList<>();
         for (Windpowerstation station : windpowerstationList) {
@@ -293,7 +282,7 @@ public class PointGenerateService {
                 if ("fjjs".equals(p.getType())) {
                     StringBuilder stationsb = new StringBuilder();
                     stationsb.append(substaion).append(station.getId().endsWith("_FDC") ? "FJJSFW." : "GFJSFW.");
-                    stationsb.append("SX_JN_").append(substaion);
+                    stationsb.append(region.getCompanyid()).append("_").append(region.getId()).append("_").append(substaion);
                     stationsb.append(station.getId().endsWith("_FDC") ? "F" : "G").append("_JS_");
                     Integer pnum = Integer.valueOf(w.getProjectid().substring(substaion.length(), w.getProjectid().indexOf("_"))) * 1;
                     stationsb.append("P").append(pnum);