Browse Source

添加健康管理测点生成代码

shilin 2 years ago
parent
commit
4bcd14f79f

+ 7 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/BackConfigMain.java

@@ -1,6 +1,8 @@
 package com.gyee.backconfig;
 
 
+import com.gyee.backconfig.service.auto.AsysncGeneratePointService;
+import com.gyee.backconfig.until.realtimedate.SpringUtils;
 import lombok.extern.log4j.Log4j2;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -21,6 +23,11 @@ public class BackConfigMain {
     public static void main(String[] args) throws UnknownHostException {
         ConfigurableApplicationContext application = SpringApplication.run(BackConfigMain.class, args);
 
+
+        AsysncGeneratePointService asysncGeneratePointService= SpringUtils.getBean("asysncGeneratePointService");
+//        asysncGeneratePointService.generatePoint(null,null,"jkfjc");
+        asysncGeneratePointService.generatePoint(null,null,"jkfcc");
+
         Environment env = application.getEnvironment();
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");

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

@@ -76,10 +76,18 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 equipmentPoints = initalFj(station, setpoints);
                 proBasicEquipmentPointService.batchAddEquipmentPoint(equipmentPoints);
                 break;
+            case "jkfjc":
+                equipmentPoints = initalJkfj(station, setpoints);
+                proBasicEquipmentPointService.batchAddEquipmentPoint(equipmentPoints);
+                break;
             case "fc":
                 powerstationPoints = initalFc();
                 proBasicPowerstationPointService.batchAddPowerstationPoints(powerstationPoints);
                 break;
+            case "jkfcc":
+                powerstationPoints = initalJkfc();
+                proBasicPowerstationPointService.batchAddPowerstationPoints(powerstationPoints);
+                break;
             case "sbs":
                 generateSubStationPoint(station, setpoints);
                 break;
@@ -642,6 +650,158 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
     }
 
+    public List<ProBasicEquipmentPoint> initalJkfj(String station,String[] setpoints) {
+
+        List<ProBasicEquipmentPoint> allpoints = new ArrayList<>();
+
+        List<ProEconTestingPoint> fdls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("jkfjc") ).collect(Collectors.toList());
+
+        for (ProBasicPowerstation wp : CacheContext.wpls) {
+
+            if (wp.getId().indexOf("GDC") >= 0) {
+                continue;
+
+            }
+            if (null != station && !"".equals(station) && !station.equals(wp.getId())) {
+                continue;
+            }
+
+            List<ProEconTestingPoint> ls = null;
+            if (wp.getId().indexOf("FDC") >= 0) {
+                ls = fdls;
+
+            }
+
+            List<ProBasicEquipment> wtls = CacheContext.poequipmentmap.get(wp.getId());
+
+
+            if (!ls.isEmpty() && null != wtls ) {
+
+                for (ProBasicEquipment wt : wtls) {
+
+                    List<ProBasicEquipmentPoint> points = new ArrayList<>();
+                    for (int i = 0; i < ls.size(); i++) {
+
+                        ProEconTestingPoint stp = ls.get(i);
+                        if(!(stp.getTypeId().endsWith(FJC) || stp.getTypeId().endsWith(GFC) )&&!stp.getModel().equals(wt.getModelId()))
+                        {
+                            continue;
+                        }
+
+                        if (null != setpoints && setpoints.length > 0 && StringUtils.join(setpoints, "|").indexOf(stp.getUniformCode()) < 0) {
+                            continue;
+                        }
+                        StringBuilder sb = new StringBuilder();
+                        String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp = temp.substring(0, temp.lastIndexOf("_"));
+                        temp = temp.substring(temp.lastIndexOf("_") + 1);
+                        if (wp.getId().indexOf("FDC") >= 0) {
+                            sb.append(wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"))).append("_").append(temp).append("_F_");
+                        } else {
+                            sb.append(wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"))).append("_").append(temp).append("_G_");
+                        }
+
+
+                        temp = null;
+                        temp = wt.getProjectId().substring(0, wt.getProjectId().lastIndexOf("_"));
+                        sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                        temp = wt.getLineId().substring(0, wt.getLineId().lastIndexOf("_"));
+                        sb.append("L").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+
+                        temp = wt.getId().substring(wt.getId().lastIndexOf("_") - 4, wt.getId().lastIndexOf("_"));
+
+                        if (temp.length() == 1) {
+                            sb.append("000").append(temp).append("_");
+                        } else if (temp.length() == 2) {
+                            sb.append("00").append(temp).append("_");
+                        } else if (temp.length() == 3) {
+                            sb.append("0").append(temp).append("_");
+                        } else {
+                            sb.append(temp).append("_");
+                        }
+
+                        sb.append(stp.getTypeId().toUpperCase()).append("_");
+
+                        if (ls.get(i).getUniformCode().indexOf("AI") >= 0) {
+                            sb.append("AI");
+
+                        } else if (ls.get(i).getUniformCode().indexOf("DI") >= 0) {
+                            sb.append("DI");
+
+                        } else {
+                            sb.append("CI");
+
+                        }
+
+                        sb.append(stp.getNemCode());
+
+                        StringBuilder sba = new StringBuilder();
+
+                        temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp = temp.substring(0, temp.lastIndexOf("_"));
+                        temp = temp.substring(temp.lastIndexOf("_") + 1);
+
+                        String temp2 = wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"));
+                        temp2 = temp2.substring(temp2.indexOf("_") + 1);
+
+                        String temp3 = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp3 = temp3.substring(0, temp3.lastIndexOf("_"));
+                        temp3 = temp3.substring(temp3.lastIndexOf("_") + 1);
+                        if (wp.getId().indexOf("FDC") >= 0) {
+                            sba.append(temp2).append(temp3).append("FJ");
+                        } else if (wp.getId().indexOf("GDC") >= 0) {
+                            sba.append(temp2).append(temp3).append("GF");
+                        }
+
+                        StringBuilder sbtable = new StringBuilder();
+
+
+                        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);
+                        }
+
+                        ProBasicEquipmentPoint po = new ProBasicEquipmentPoint();
+                        po.setId(StringUtils.getUUID());
+//                        po.setNemCode(V2Config.getInitialcode());
+
+                        if (stp.getUniformCode().indexOf("AI") < 0 && stp.getUniformCode().indexOf("DI") < 0) {
+                            po.setNemCode(String.valueOf(sbtable));
+                        } else {
+                            po.setNemCode("INITIAL");
+                        }
+
+                        sb = new StringBuilder();
+                        sb.append(wt.getName()).append(stp.getName());
+                        po.setName(String.valueOf(sb));
+                        po.setModel(wt.getModelId());
+                        po.setModelId(wt.getModelId());
+                        po.setWindturbineId(wt.getId());
+                        po.setUniformCode(stp.getUniformCode());
+                        po.setTypeId(stp.getTypeId());
+                        po.setWindpowerstationId(wt.getWindpowerstationId());
+                        po.setLogicalUnitId(ls.get(i).getLogicalUnitId());
+                        po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
+                        points.add(po);
+
+
+                    }
+                    allpoints.addAll(points);
+                }
+
+            }
+//            }
+
+        }
+        return allpoints;
+
+    }
+
 
     public List<ProBasicPowerstationPoint> initalFc() {
 
@@ -1203,6 +1363,413 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     }
 
 
+    public List<ProBasicPowerstationPoint> initalJkfc() {
+
+        List<ProEconTestingPoint> pointls = CacheContext.tpls.stream()
+                .filter(i -> i.getTypeId().equals("jkfcc")).collect(Collectors.toList());
+
+        pointls = pointls.stream().filter(DistinctObject.distinctByKey(p->p.getUniformCode())).collect(Collectors.toList());
+
+        List<ProEconTestingPoint> fdpointls = CacheContext.tpls.stream()
+                .filter(i -> i.getTypeId().equals("jkfcc")).collect(Collectors.toList());
+
+
+
+        List<ProBasicRegion> regions = proBasicRegionService.list();
+
+        List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
+
+        if (!regions.isEmpty()) {
+
+
+            for (ProBasicRegion re : regions) {
+
+                StringBuilder sba = new StringBuilder();
+                sba.append(re.getId().substring(0, re.getId().indexOf("_"))).append("_");
+/********************************************区域公司测点**************************************************/
+
+
+                List<ProBasicPowerstationPoint> points = new ArrayList<>();
+                for (int i = 0; i < pointls.size(); i++) {
+                    ProEconTestingPoint stp = pointls.get(i);
+//                    List<ProBasicPowerstation> groupFCRegion = CacheContext.wpmapGroupFCRegion.get(re.getId());
+//                    if((null == groupFCRegion || groupFCRegion.size()<=0) && stp.getTypeId().equals(FCJSFW) ){
+//                        continue;
+//                    }
+//
+//                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCRegion.get(re.getId());
+//                    if((null == groupGCRegion || groupGCRegion.size()<=0) && stp.getTypeId().equals(GCJSFW) ){
+//                        continue;
+//                    }
+
+                    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_");
+                    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(re.getName()).append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+
+                    StringBuilder tempsb = new StringBuilder();
+
+                    if (StringUtils.notEmp(re.getNemCode())) {
+                        tempsb.append(re.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);
+                // windPowerstationTestingPointService.insertBatch(points);
+
+/*******************************************区域公司测点*******************************************************/
+/********************************************风电场公司测点**************************************************/
+                points = new ArrayList<>();
+
+                for (int i = 0; i < fdpointls.size(); i++) {
+
+                    List<ProBasicPowerstation> groupFCRegion = CacheContext.wpmapGroupFCRegion.get(re.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(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_");
+                    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(re.getName()).append("风电").append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+
+                    StringBuilder tempsb = new StringBuilder();
+                    if (StringUtils.notEmp(re.getNemCode())) {
+                        tempsb.append(re.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);
+
+                /*******************************************风电测点生成*******************************************************/
+
+
+/*********************************************光伏测点生成*****************************************************/
+
+
+                List<ProBasicCompany> companys = proBasicCompanyService.list().stream().filter(i -> i.getRegionId().equals(re.getId())).collect(Collectors.toList());
+                if (!companys.isEmpty()) {
+                    for (ProBasicCompany cs : companys) {
+                        sba = new StringBuilder();
+                        sba.append(cs.getId().substring(0, cs.getId().lastIndexOf("_"))).append("_");
+/********************************************区域公司测点**************************************************/
+                        points = new ArrayList<>();
+                        for (int i = 0; i < pointls.size(); i++) {
+                            ProEconTestingPoint stp = pointls.get(i);
+//                            List<ProBasicPowerstation> groupFCCompany = CacheContext.wpmapGroupFCCompany.get(cs.getId());
+//                            if((null == groupFCCompany || groupFCCompany.size()<=0) && stp.getTypeId().equals(FCJSFW) ){
+//                                continue;
+//                            }
+//
+//                            List<ProBasicPowerstation> groupGCCompany  = CacheContext.wpmapGroupGCCompany.get(cs.getId());
+//                            if((null == groupGCCompany || groupGCCompany.size()<=0) && stp.getTypeId().equals(GCJSFW) ){
+//                                continue;
+//                            }
+
+                            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_X_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(cs.getName()).append(stp.getName());
+                            po.setName(String.valueOf(sb));
+                            po.setModel(null);
+                            po.setModelId(null);
+
+                            StringBuilder tempsb = new StringBuilder();
+
+                            if (StringUtils.notEmp(cs.getNemCode())) {
+                                tempsb.append(cs.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);
+                        // windPowerstationTestingPointService.insertBatch(points);
+
+/*******************************************区域公司测点*******************************************************/
+/********************************************风电场公司测点**************************************************/
+                        points = new ArrayList<>();
+
+                        sba = new StringBuilder();
+                        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;
+                            }
+                            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_");
+                            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(cs.getName()).append("风电").append(stp.getName());
+                            po.setName(String.valueOf(sb));
+                            po.setModel(null);
+                            po.setModelId(null);
+
+                            StringBuilder tempsb = new StringBuilder();
+                            if (StringUtils.notEmp(cs.getNemCode())) {
+                                tempsb.append(cs.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);
+                        // windPowerstationTestingPointService.insertBatch(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);
+
+                /*******************************************风电测点生成*******************************************************/
+
+
+
+            }
+        }
+
+
+        /*********************************************场站、项目、线路测点生成*****************************************************/
+
+
+        for (ProBasicPowerstation wp : CacheContext.wpls) {
+            List<ProEconTestingPoint> ls = null;
+            if (wp.getId().indexOf("FDC") >= 0) {
+                ls = fdpointls;
+                createWpPoints(wp, ls, allpoints);
+                createPjPoints(wp, ls, allpoints);
+                createLnPoints(wp, ls, allpoints);
+            }
+//            List<ProEconTestingPoint>  lns = CacheContext.tpls.stream()
+//                    .filter(i -> i.getTypeId().equals("ln")).collect(Collectors.toList());
+//            lns.addAll(ls);
+
+
+        }
+        return allpoints;
+    }
+
+
     private void createWpPoints(ProBasicPowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicPowerstationPoint> allpoints) {
         List<ProBasicPowerstationPoint> points = new ArrayList<>();
         for (int i = 0; i < stpointls.size(); i++) {

+ 116 - 0
web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/until/realtimedate/SpringUtils.java

@@ -0,0 +1,116 @@
+package com.gyee.backconfig.until.realtimedate;
+
+import org.springframework.aop.framework.AopContext;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.stereotype.Component;
+
+/**
+* spring工具类 方便在非spring管理环境中获取bean
+* @ClassName: SpringUtils
+* @author gyee
+* @date 2019-09-11 11:28
+*
+ */
+@Component
+public final class SpringUtils implements BeanFactoryPostProcessor
+{
+    /** Spring应用上下文环境 */
+    private static ConfigurableListableBeanFactory beanFactory;
+
+    @Override
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
+    {
+        SpringUtils.beanFactory = beanFactory;
+    }
+
+    /**
+     * 获取对象
+     *
+     * @param name
+     * @return Object 一个以所给名字注册的bean的实例
+     * @throws BeansException
+     *
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getBean(String name) throws BeansException
+    {
+        return (T) beanFactory.getBean(name);
+    }
+
+    /**
+     * 获取类型为requiredType的对象
+     *
+     * @param clz
+     * @return
+     * @throws BeansException
+     *
+     */
+    public static <T> T getBean(Class<T> clz) throws BeansException
+    {
+        T result = (T) beanFactory.getBean(clz);
+        return result;
+    }
+
+    /**
+     * 如果BeanFactory包含一个与所给名称匹配的bean定义,则返回true
+     *
+     * @param name
+     * @return boolean
+     */
+    public static boolean containsBean(String name)
+    {
+        return beanFactory.containsBean(name);
+    }
+
+    /**
+     * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到,将会抛出一个异常(NoSuchBeanDefinitionException)
+     *
+     * @param name
+     * @return boolean
+     * @throws NoSuchBeanDefinitionException
+     *
+     */
+    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
+    {
+        return beanFactory.isSingleton(name);
+    }
+
+    /**
+     * @param name
+     * @return Class 注册对象的类型
+     * @throws NoSuchBeanDefinitionException
+     *
+     */
+    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException
+    {
+        return beanFactory.getType(name);
+    }
+
+    /**
+     * 如果给定的bean名字在bean定义中有别名,则返回这些别名
+     *
+     * @param name
+     * @return
+     * @throws NoSuchBeanDefinitionException
+     *
+     */
+    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
+    {
+        return beanFactory.getAliases(name);
+    }
+
+    /**
+     * 获取aop代理对象
+     * 
+     * @param invoker
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getAopProxy(T invoker)
+    {
+        return (T) AopContext.currentProxy();
+    }
+}

+ 1 - 1
web/backmanagerconfig-xktj/src/main/resources/application-test.yml

@@ -43,7 +43,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://124.70.75.91:5432/jn_test #IMS_NEM_SD
+    url: jdbc:postgresql://127.0.0.1:5432/IMS_NEM_JN #IMS_NEM_SD
     username: postgres
     password: gd123
     oracle-schema=: