气象站、镇区测点生成业务方法

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/config/CacheContext.java

@@ -50,6 +50,9 @@ public class CacheContext implements CommandLineRunner {
     @Autowired
     private IProBasicSquareService proBasicSquareService;
 
+    @Autowired
+    private IProBasicWeatherStationService proBasicWeatherStationService;//气象站
+
     //集团
     public static Map<String, ProBasicEnergyGroup> energymap = new HashMap<>();
     public static List<ProBasicEnergyGroup> groups = new ArrayList<>();
@@ -92,10 +95,15 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String, ProBasicSubStation> subStationMap = new HashMap<>();
     public static Map<String, List<ProBasicSubStation>> poSubStationMap = new HashMap<>();//更据场站分组
 
+    public static List<ProBasicWeatherStation> wsStations = new ArrayList<>();
+    public static Map<String, ProBasicWeatherStation> wsStationMap = new HashMap<>();
+    public static Map<String, List<ProBasicWeatherStation>> poWsStationMap = new HashMap<>();//更据场站分组
 
     //方阵
     public static List<ProBasicSquare> squares = new ArrayList<>();
     public static Map<String, ProBasicSquare> squareMap = new HashMap<>();
+    public static Map<String, List<ProBasicSquare>> poSquareMap = new HashMap<>();
+
 
 
 
@@ -128,6 +136,9 @@ public class CacheContext implements CommandLineRunner {
         //方阵
         initSquaresList();
 
+        //气象站
+        initWsStationList();
+
         System.out.println(">>>>>>>>>>>>>>>数据缓存完成<<<<<<<<<<<<<<");
 
     }
@@ -251,7 +262,7 @@ public class CacheContext implements CommandLineRunner {
     }
 
     /**
-     * 初始化线路数据
+     * 初始化变电所数据
      */
     public void initSubStationList(){
         //清理集合数据
@@ -272,15 +283,34 @@ public class CacheContext implements CommandLineRunner {
     /**
      * 初始化方阵数据
      */
-    public void initSquaresList(){
+    public void initSquaresList() {
         squares.clear();
         squareMap.clear();
         squares = proBasicSquareService.list();
-        squares.stream().forEach(i->{
-            squareMap.put(i.getId(),i);
+        squares.stream().forEach(i -> {
+            squareMap.put(i.getId(), i);
         });
+        poSquareMap = squares.stream().collect(Collectors.groupingBy(ProBasicSquare::getWindpowerstationId));
     }
 
 
+    /**
+     * 初始化气象站数据
+     */
+    public void initWsStationList(){
+        //清理集合数据
+        wsStations.clear();
+        wsStationMap.clear();
+        poWsStationMap.clear();
+
+        wsStations = proBasicWeatherStationService.list();
+        wsStations.stream().forEach(s->{
+            wsStationMap.put(s.getId(),s);
+        });
+
+        poWsStationMap =  wsStations.stream().collect(Collectors.groupingBy(ProBasicWeatherStation::getWindpowerstationId));
+
+    }
+
 
 }

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

@@ -85,6 +85,7 @@ public class ProBasicEnergyGroupController {
         String[] strings = ids.split(",");
         boolean b = proBasicEnergyGroupService.removeByIds(Arrays.asList(strings));
         if (b) {
+            cacheContext.initGroupList();
             return R.ok().data(b);
         } else {
             return R.error().data("删除失败！");

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicWeatherStationController.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 2022-11-28
+ */
+@RestController
+@RequestMapping("//pro-basic-weather-station")
+public class ProBasicWeatherStationController {
+
+}

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

@@ -118,8 +118,6 @@ public class ProEconTestingPointController {
 
     @PostMapping(value = "/generateSubStationPoint")
     @ApiOperation(value = "变电所测点生成", notes = "变电所测点生成")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "points", value = "统一编码", required = true, dataType = "string[]", paramType = "query"),
-            @ApiImplicitParam(name = "station", value = "变电所id", required = true, dataType = "string", paramType = "query")})
     public R generateSubStationPoint(@RequestParam(value = "points", required = false) String[] points,
                            @RequestParam(value = "station", required = false) String station) {
         try {
@@ -131,4 +129,31 @@ public class ProEconTestingPointController {
         return R.ok().data(true);
     }
 
+
+    @PostMapping(value = "/generateWsStationPoint")
+    @ApiOperation(value = "气象站测点生成", notes = "气象站测点生成")
+    public R generateWsStationPoint(@RequestParam(value = "points", required = false) String[] points,
+                                     @RequestParam(value = "station", required = false) String station) {
+        try {
+            proEconTestingPointService.generateWsStationPoint(station,points);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error();
+        }
+        return R.ok().data(true);
+    }
+
+
+    @PostMapping(value = "/generateWsStationPoint")
+    @ApiOperation(value = "光伏阵区测点生成", notes = "光伏阵区测点生成")
+    public R generateSquareStationPoint(@RequestParam(value = "points", required = false) String[] points,
+                                    @RequestParam(value = "station", required = false) String station) {
+        try {
+            proEconTestingPointService.generateSquareStationPoint(station,points);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error();
+        }
+        return R.ok().data(true);
+    }
 }

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

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.ProBasicWeatherStation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 气象站名称 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-28
+ */
+public interface ProBasicWeatherStationMapper extends BaseMapper<ProBasicWeatherStation> {
+
+}

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

@@ -0,0 +1,61 @@
+package com.gyee.backconfig.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 气象站名称
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="ProBasicWeatherStation对象", description="气象站名称")
+public class ProBasicWeatherStation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private String id;
+
+    @ApiModelProperty(value = "编码")
+    private String nemCode;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "别名")
+    private String aname;
+
+    @ApiModelProperty(value = "风场编号")
+    private String windpowerstationId;
+
+    @ApiModelProperty(value = "顺序")
+    private Integer orderNum;
+
+    @ApiModelProperty(value = "是否可用")
+    private Integer isAble;
+
+    @ApiModelProperty(value = "备用1")
+    private String spare1;
+
+    @ApiModelProperty(value = "备用2")
+    private String spare2;
+
+    @ApiModelProperty(value = "备用3")
+    private String spare3;
+
+    @ApiModelProperty(value = "备用4")
+    private String spare4;
+
+    private BigDecimal capacity;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.service.auto;
+
+import com.gyee.backconfig.model.auto.ProBasicWeatherStation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 气象站名称 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-28
+ */
+public interface IProBasicWeatherStationService extends IService<ProBasicWeatherStation> {
+
+}

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

@@ -18,6 +18,10 @@ public interface IProEconTestingPointService extends IService<ProEconTestingPoin
 
      void generateSubStationPoint(String station,String[] points);
 
+     void generateWsStationPoint(String station,String[] points);
+
+     void generateSquareStationPoint(String station,String[] points);
+
      IPage<ProEconTestingPoint> list (String id,String nemCode, String name,String model,String uniformCode, String isDisplay,String pageNum, String pageSize);
 
 

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

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.gyee.backconfig.model.auto.ProBasicWeatherStation;
+import com.gyee.backconfig.mapper.auto.ProBasicWeatherStationMapper;
+import com.gyee.backconfig.service.auto.IProBasicWeatherStationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 气象站名称 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-28
+ */
+@Service
+public class ProBasicWeatherStationServiceImpl extends ServiceImpl<ProBasicWeatherStationMapper, ProBasicWeatherStation> implements IProBasicWeatherStationService {
+
+}

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

@@ -62,7 +62,6 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
             proBasicEquipmentPointService.batchAddEquipmentPoint(equipmentPoints);
             proBasicPowerstationPointService.batchAddPowerstationPoints(powerstationPoints);
 
-            generateSubStationPoint(station,setpoints);
 
     }
 
@@ -76,6 +75,21 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     }
 
     @Override
+    public void generateWsStationPoint(String station, String[] points) {
+        List<ProBasicPowerstationPoint>  wsStationPoint = initalWs(station,points);
+
+        proBasicPowerstationPointService.batchAddPowerstationPoints(wsStationPoint);
+    }
+
+    @Override
+    public void generateSquareStationPoint(String station, String[] points) {
+        List<ProBasicPowerstationPoint>  ssStationPoint = initalSs(station,points);
+
+        proBasicPowerstationPointService.batchAddPowerstationPoints(ssStationPoint);
+
+    }
+
+    @Override
     public IPage<ProEconTestingPoint> list(String id, String nemCode, String name, String model, String uniformCode, String isDisplay, String pageNum, String pageSize) {
         QueryWrapper<ProEconTestingPoint> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
@@ -105,16 +119,115 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
 
     /**
-     *
+     * 阵区测点
      * @param station
      * @param setpoints
      * @return
      */
-    public List<ProBasicPowerstationPoint> initalSbs(String station,String[] setpoints) {
+    public List<ProBasicPowerstationPoint> initalSs(String station,String[] setpoints) {
+        List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
+
+        List<ProEconTestingPoint> ls = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("zq")).collect(Collectors.toList());
+        //获取场站
+        for (ProBasicPowerstation postation : CacheContext.wpls) {
+            if (null != station && !"".equals(station) && !station.equals(postation.getId())) {
+                continue;
+            }
+
+            //获取场站下的阵区
+            List<ProBasicSquare> squaare = CacheContext.poSquareMap.get(postation.getId()).stream().filter(i -> i.getTypes().equals("jz")).collect(Collectors.toList());
+            //循环阵区生成测点code
+            for (ProBasicSquare ss : squaare) {
+                List<ProBasicPowerstationPoint> points = new ArrayList<>();
+
+                for (ProEconTestingPoint p : ls) {
+                    if (null != setpoints && setpoints.length > 0 && StringUtils.join(setpoints, "|").indexOf(p.getUniformCode()) < 0) {
+                        continue;
+                    }
+                    StringBuilder sb = new StringBuilder();
+                    String temp = ss.getId().substring(0, ss.getId().lastIndexOf("_"));
+//                    temp = temp.substring(0, temp.lastIndexOf("_"));
+//                    temp = temp.substring(temp.lastIndexOf("_") + 1);
+                    if (ss.getWindpowerstationId().indexOf("FDC") >= 0) {
+                        sb.append(temp).append("_F_");
+                    } else {
+                        sb.append(temp).append("_G_");
+                    }
+
+                    sb.append("XX_XX_XXXX_");
+                    if (p.getUniformCode().indexOf("AI") >= 0) {
+                        sb.append("AI");
+
+                    } else if (p.getUniformCode().indexOf("DI") >= 0) {
+                        sb.append("DI");
+
+                    } else {
+                        sb.append("CI");
+                    }
+                    sb.append(p.getNemCode());
+
+
+                    StringBuilder sba = new StringBuilder();
+
+                    String temp2 = postation.getCompanyId().substring(0, postation.getCompanyId().lastIndexOf("_"));
+                    temp2 = temp2.substring(temp2.indexOf("_") + 1);
+
+                    String temp3 = postation.getId().substring(0, postation.getId().lastIndexOf("_"));
+                    temp3 = temp3.substring(0, temp3.lastIndexOf("_"));
+                    temp3 = temp3.substring(temp3.lastIndexOf("_") + 1);
+                    if (postation.getId().indexOf("FDC") >= 0) {
+                        sba.append(temp2).append(temp3).append("FC");
+                    } else if (postation.getId().indexOf("GDC") >= 0) {
+                        sba.append(temp2).append(temp3).append("GC");
+                    }
+
+                    StringBuilder sbtable = new StringBuilder();
+
+
+                    if (p.getTypeId().endsWith("jsfw")) {
+                        sbtable.append(sba).append("JSFW.");
+                        sbtable.append(sb);
+                    } else {
+                        sbtable.append(sba).append(".");
+                        sbtable.append(sb);
+                    }
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                    po.setId(StringUtils.getUUID());
+                    if (p.getTypeId().endsWith("jsfw")) {
+                        po.setNemCode(String.valueOf(sbtable));
+                    } else {
+                    po.setNemCode("INITIAL");
+                    }
+                    sb = new StringBuilder();
+                    sb.append(ss.getName()).append(p.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setWindpowerstationId(ss.getId());
+                    po.setUniformCode(p.getUniformCode());
+                    po.setTypeId(p.getTypeId());
+                    sb = new StringBuilder();
+                    sb.append(sbtable.toString().substring(0, sbtable.toString().lastIndexOf(".")));
+                    po.setRealtimeId(String.valueOf(sb));
+                    points.add(po);
+                }
+                allpoints.addAll(points);
+            }
+        }
+
+        return allpoints;
+    }
+
+
+    /**
+     * 气象站测点
+     * @param station
+     * @param setpoints
+     * @return
+     */
+    public List<ProBasicPowerstationPoint> initalWs(String station,String[] setpoints) {
         List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
 
-        List<ProEconTestingPoint> fcs = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") || i.getTypeId().equals("fggl") || i.getTypeId().equals("cft")).collect(Collectors.toList());
-        List<ProEconTestingPoint> gcs = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") || i.getTypeId().equals("fggl") || i.getTypeId().equals("qxz")).collect(Collectors.toList());
+        List<ProEconTestingPoint> fcs = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("fggl") || i.getTypeId().equals("cft")).collect(Collectors.toList());
+        List<ProEconTestingPoint> gcs = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("fggl") || i.getTypeId().equals("qxz")).collect(Collectors.toList());
         //获取场站
         for (ProBasicPowerstation postation : CacheContext.wpls) {
             if (null != station && !"".equals(station) && !station.equals(postation.getId())) {
@@ -128,6 +241,107 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 ls = gcs;
             }
 
+            //获取场站下的气象站
+            List<ProBasicWeatherStation> subStations = CacheContext.poWsStationMap.get(postation.getId());
+            //循环气象站生成测点code
+            for (ProBasicWeatherStation ws : subStations) {
+                List<ProBasicPowerstationPoint> points = new ArrayList<>();
+
+                for (ProEconTestingPoint p : ls) {
+                    if (null != setpoints && setpoints.length > 0 && StringUtils.join(setpoints, "|").indexOf(p.getUniformCode()) < 0) {
+                        continue;
+                    }
+                    StringBuilder sb = new StringBuilder();
+                    String temp = ws.getId().substring(0, ws.getId().lastIndexOf("_"));
+//                    temp = temp.substring(0, temp.lastIndexOf("_"));
+//                    temp = temp.substring(temp.lastIndexOf("_") + 1);
+                    if (ws.getWindpowerstationId().indexOf("FDC") >= 0) {
+                        sb.append(temp).append("_F_");
+                    } else {
+                        sb.append(temp).append("_G_");
+                    }
+
+                    sb.append("XX_XX_XXXX_");
+                    if (p.getUniformCode().indexOf("AI") >= 0) {
+                        sb.append("AI");
+
+                    } else if (p.getUniformCode().indexOf("DI") >= 0) {
+                        sb.append("DI");
+
+                    } else {
+                        sb.append("CI");
+                    }
+                    sb.append(p.getNemCode());
+
+
+                    StringBuilder sba = new StringBuilder();
+
+                    String temp2 = postation.getCompanyId().substring(0, postation.getCompanyId().lastIndexOf("_"));
+                    temp2 = temp2.substring(temp2.indexOf("_") + 1);
+
+                    String temp3 = postation.getId().substring(0, postation.getId().lastIndexOf("_"));
+                    temp3 = temp3.substring(0, temp3.lastIndexOf("_"));
+                    temp3 = temp3.substring(temp3.lastIndexOf("_") + 1);
+                    if (postation.getId().indexOf("FDC") >= 0) {
+                        sba.append(temp2).append(temp3).append("FC");
+                    } else if (postation.getId().indexOf("GDC") >= 0) {
+                        sba.append(temp2).append(temp3).append("GC");
+                    }
+
+                    StringBuilder sbtable = new StringBuilder();
+
+
+                    if (p.getTypeId().endsWith("jsfw")) {
+                        sbtable.append(sba).append("JSFW.");
+                        sbtable.append(sb);
+                    } else {
+                        sbtable.append(sba).append(".");
+                        sbtable.append(sb);
+                    }
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                    po.setId(StringUtils.getUUID());
+//                    if (p.getTypeId().indexOf("agcjsfw") >= 0 ) {
+//                        po.setNemCode(String.valueOf(sbtable));
+//                    } else {
+                    po.setNemCode("INITIAL");
+//                    }
+                    sb = new StringBuilder();
+                    sb.append(ws.getName()).append(p.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setWindpowerstationId(ws.getId());
+                    po.setUniformCode(p.getUniformCode());
+                    po.setTypeId(p.getTypeId());
+                    sb = new StringBuilder();
+                    sb.append(sbtable.toString().substring(0, sbtable.toString().lastIndexOf(".")));
+                    po.setRealtimeId(String.valueOf(sb));
+                    points.add(po);
+                }
+                allpoints.addAll(points);
+            }
+        }
+
+        return allpoints;
+    }
+
+
+
+
+    /**
+     * 变电所测点
+     * @param station
+     * @param setpoints
+     * @return
+     */
+    public List<ProBasicPowerstationPoint> initalSbs(String station,String[] setpoints) {
+        List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
+
+        List<ProEconTestingPoint> ls = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") ).collect(Collectors.toList());
+        //获取场站
+        for (ProBasicPowerstation postation : CacheContext.wpls) {
+            if (null != station && !"".equals(station) && !station.equals(postation.getId())) {
+                continue;
+            }
+
             //获取场站下的变电所
             List<ProBasicSubStation> subStations = CacheContext.poSubStationMap.get(postation.getId());
             //循环变电所生成测点code
@@ -409,15 +623,15 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 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;
-                    }
+//                    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();
@@ -579,15 +793,15 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         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;
-                            }
+//                            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();