增加支路

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

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-28
+ */
+@RestController
+@RequestMapping("//pro-basic-branch")
+public class ProBasicBranchController {
+
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicBranchMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.ProBasicBranch;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-28
+ */
+public interface ProBasicBranchMapper extends BaseMapper<ProBasicBranch> {
+
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicBranch.java

@@ -0,0 +1,54 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicBranch extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String nemCode;
+
+    private String windpowerstationId;
+
+    private String projectId;
+
+    private String lineId;
+
+    private String name;
+
+    private String aname;
+
+    private String types;
+
+    private Integer isAble;
+
+    private String spare1;
+
+    private String spare2;
+
+    private String spare3;
+
+    private String spare4;
+
+    private String inteverId;
+
+    private String combinerId;
+
+    private String squareId;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.service.auto;
+
+import com.gyee.backconfig.model.auto.ProBasicBranch;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-28
+ */
+public interface IProBasicBranchService extends IService<ProBasicBranch> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.gyee.backconfig.model.auto.ProBasicBranch;
+import com.gyee.backconfig.mapper.auto.ProBasicBranchMapper;
+import com.gyee.backconfig.service.auto.IProBasicBranchService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-28
+ */
+@Service
+public class ProBasicBranchServiceImpl extends ServiceImpl<ProBasicBranchMapper, ProBasicBranch> implements IProBasicBranchService {
+
+}

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

@@ -500,9 +500,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
         List<ProBasicEquipmentPoint> allpoints = new ArrayList<>();
 
-        List<ProEconTestingPoint> fdls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("F") || i.getTypeId().equals(FJC)).collect(Collectors.toList());
+//        List<ProEconTestingPoint> fdls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("F") || i.getTypeId().equals(FJC)).collect(Collectors.toList());
 
-        List<ProEconTestingPoint> gfls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("G") || i.getTypeId().equals("zl") || i.getTypeId().equals(GFC)).collect(Collectors.toList());
+//        List<ProEconTestingPoint> gfls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("G") || i.getTypeId().equals("zl") || i.getTypeId().equals(GFC)).collect(Collectors.toList());
+        List<ProEconTestingPoint> gfls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("zl") ).collect(Collectors.toList());
 
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 
@@ -510,9 +511,13 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 continue;
             }
 
+            if (wp.getSpare4().equals("1")){
+                continue;
+            }
+
             List<ProEconTestingPoint> ls = null;
             if (wp.getId().indexOf("FDC") >= 0) {
-                ls = fdls;
+//                ls = fdls;
 
             } else {
                 ls = gfls;
@@ -521,12 +526,25 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
             List<ProBasicEquipment> wtls = CacheContext.poequipmentmap.get(wp.getId());
 
+            List<ProBasicBranch> brls = CacheContext.branchmap.get(wp.getId());
+
 
             if (!ls.isEmpty() && null != wtls ) {
 
                 for (ProBasicEquipment wt : wtls) {
 
-                    List<ProBasicEquipmentPoint> points = new ArrayList<>();
+                    if (wt.getSpare1().contains("WT")){
+                        continue;
+                    }
+
+                    for (ProBasicBranch br : brls){
+                        if (!(br.getInteverId().equals(wt.getId()))){
+                            continue;
+                        }
+
+
+
+                        List<ProBasicEquipmentPoint> points = new ArrayList<>();
                     for (int i = 0; i < ls.size(); i++) {
 
 
@@ -625,14 +643,14 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         }
 
                         sb = new StringBuilder();
-                        sb.append(wt.getName()).append(stp.getName());
+                        sb.append(wt.getName()).append(br.getName().substring(br.getName().length()-5)).append(stp.getName());
                         po.setName(String.valueOf(sb));
                         po.setModel(wt.getModelId());
                         po.setModelId(wt.getModelId());
-                        po.setWindturbineId(wt.getId());
+                        po.setWindturbineId(br.getId());
                         po.setUniformCode(stp.getUniformCode());
                         po.setTypeId(stp.getTypeId());
-                        po.setWindpowerstationId(wt.getWindpowerstationId());
+                        po.setWindpowerstationId(wt.getId());
                         po.setLogicalUnitId(ls.get(i).getLogicalUnitId());
                         po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
                         points.add(po);
@@ -640,11 +658,13 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                     }
                     allpoints.addAll(points);
-                }
+
 
             }
 //            }
+                }
 
+            }
         }
         return allpoints;
 
@@ -895,10 +915,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                 for (int i = 0; i < fdpointls.size(); i++) {
 
-                    List<ProBasicPowerstation> groupFCRegion = CacheContext.wpmapGroupFCRegion.get(re.getId());
-                    if(null == groupFCRegion || groupFCRegion.size()<=0){
-                        break;
-                    }
+//                    List<ProBasicPowerstation> groupFCRegion = CacheContext.wpmapGroupFCRegion.get(re.getId());
+//                    if(null == groupFCRegion || groupFCRegion.size()<=0){
+//                        break;
+//                    }
 
                     sba = new StringBuilder();
 
@@ -949,10 +969,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 points = new ArrayList<>();
                 for (int i = 0; i < gfpointls.size(); i++) {
 
-                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCRegion.get(re.getId());
-                    if(null == groupGCRegion || groupGCRegion.size()<=0){
-                        break;
-                    }
+//                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCRegion.get(re.getId());
+//                    if(null == groupGCRegion || groupGCRegion.size()<=0){
+//                        break;
+//                    }
 
                     ProEconTestingPoint stp = gfpointls.get(i);
                     StringBuilder sb = new StringBuilder();
@@ -1065,10 +1085,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         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;
-                            }
+//                            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();
@@ -1120,10 +1140,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         points = new ArrayList<>();
                         for (int i = 0; i < gfpointls.size(); i++) {
 
-                            List<ProBasicPowerstation> groupGCCompany = CacheContext.wpmapGroupGCCompany.get(cs.getId());
-                            if(null == groupGCCompany || groupGCCompany.size()<=0){
-                                break;
-                            }
+//                            List<ProBasicPowerstation> groupGCCompany = CacheContext.wpmapGroupGCCompany.get(cs.getId());
+//                            if(null == groupGCCompany || groupGCCompany.size()<=0){
+//                                break;
+//                            }
                             ProEconTestingPoint stp = gfpointls.get(i);
                             StringBuilder sb = new StringBuilder();
                             StringBuilder sbtable = new StringBuilder();
@@ -1169,173 +1189,173 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
             }
         }
 
-        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);
-
-                /*******************************************风电测点生成*******************************************************/
-
-
-/*********************************************光伏测点生成*****************************************************/
-
-                points = new ArrayList<>();
-                for (int i = 0; i < gfpointls.size(); i++) {
-
-                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCgroup.get(group.getId());
-                    if(null == groupGCRegion || groupGCRegion.size()<=0){
-                        break;
-                    }
-
-                    ProEconTestingPoint stp = gfpointls.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_G_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("-2");
-                    } else {
-                        tempsb.append("-2");
-                    }
-
-                    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<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);
+//
+//                /*******************************************风电测点生成*******************************************************/
+//
+//
+///*********************************************光伏测点生成*****************************************************/
+//
+//                points = new ArrayList<>();
+//                for (int i = 0; i < gfpointls.size(); i++) {
+//
+//                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCgroup.get(group.getId());
+//                    if(null == groupGCRegion || groupGCRegion.size()<=0){
+//                        break;
+//                    }
+//
+//                    ProEconTestingPoint stp = gfpointls.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_G_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("-2");
+//                    } else {
+//                        tempsb.append("-2");
+//                    }
+//
+//                    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);
+//
+//            }
+//        }
 
 
         /*********************************************场站、项目、线路测点生成*****************************************************/