场站测点生成代码修改提交，光伏计算服务新增方山，繁峙

realtime/generationGF-service/src/main/resources/application-jn.yml

@@ -81,15 +81,17 @@ logging:
   level:
     root: info
     com.example: debug
-#db url
+#db url适配器
 db:
-  url: http://10.81.3.152:8011/ts
+  url: http://10.81.3.152:8099/ts
 #参与计算的场站
-runWindpowerstation: SY_GDC
+runWindpowerstation: JR_GDC,FS_GDC
+#runWindpowerstation: JR_GDC
 #计算状态用ai或者di
 clauStatus:
   ai:   #配置期次
-  di: SY02_GC
+  di: FS01_GC,JR01_GC
+
 
 #判断数据终端
 second: 7200

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

@@ -84,9 +84,11 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String, ProBasicPowerstation> wpmap = new HashMap<>();
     public static List<ProBasicPowerstation> wpls = new ArrayList<>();
     public static Map<String, List<ProBasicPowerstation>> wpmapGroupGCRegion = new HashMap<>();
+    public static Map<String, List<ProBasicPowerstation>> wpmapGroupGCgroup = new HashMap<>();
     public static Map<String, List<ProBasicPowerstation>> wpmapGroupGCCompany = new HashMap<>();
     public static Map<String, List<ProBasicPowerstation>> wpmapGroupFCRegion = new HashMap<>();
     public static Map<String, List<ProBasicPowerstation>> wpmapGroupFCCompany = new HashMap<>();
+    public static Map<String, List<ProBasicPowerstation>> wpmapGroupFCgroup = new HashMap<>();
 
 
 
@@ -247,7 +249,9 @@ public class CacheContext implements CommandLineRunner {
         wpmapGroupGCCompany.clear();
         wpmapGroupFCCompany.clear();
         wpmapGroupGCRegion.clear();
+        wpmapGroupGCgroup.clear();
         wpmapGroupFCRegion.clear();
+        wpmapGroupFCgroup.clear();
 
         wpls = proBasicPowerstationService.list();
         wpls.stream().forEach(windpowerstation -> {
@@ -256,7 +260,9 @@ public class CacheContext implements CommandLineRunner {
 
 
         wpmapGroupGCRegion =  wpls.stream().filter(p-> p.getId().indexOf("_GDC_") >= 0).collect(Collectors.groupingBy(ProBasicPowerstation::getRegionId));
+        wpmapGroupGCgroup =  wpls.stream().filter(p-> p.getId().indexOf("_GDC_") >= 0).collect(Collectors.groupingBy(ProBasicPowerstation::getGroupId));
         wpmapGroupFCRegion =  wpls.stream().filter(p-> p.getId().indexOf("_FDC_") >= 0).collect(Collectors.groupingBy(ProBasicPowerstation::getRegionId));
+        wpmapGroupFCgroup =  wpls.stream().filter(p-> p.getId().indexOf("_FDC_") >= 0).collect(Collectors.groupingBy(ProBasicPowerstation::getGroupId));
 
 
         wpmapGroupGCCompany = wpls.stream().filter(p-> p.getId().indexOf("_GDC_") >= 0).collect(Collectors.groupingBy(ProBasicPowerstation::getCompanyId));

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

@@ -49,6 +49,8 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     private IProEconTestingPointService proEconTestingPointService;
 
     @Resource
+    private IProBasicEnergyGroupService proBasicEnergyGroupService;
+    @Resource
     private IProBasicRegionService proBasicRegionService;
 
     @Resource
@@ -492,7 +494,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
         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(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());
 
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 
@@ -521,7 +523,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
 
                         ProEconTestingPoint stp = ls.get(i);
-                        if((!stp.getTypeId().endsWith(FJC) || !stp.getTypeId().endsWith(FJC) )&&!stp.getModel().equals(wt.getModelId()))
+                        if(!(stp.getTypeId().endsWith(FJC) || stp.getTypeId().endsWith(GFC) )&&!stp.getModel().equals(wt.getModelId()))
                         {
                             continue;
                         }
@@ -795,6 +797,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                     ProEconTestingPoint stp = gfpointls.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_G_XX_XX_XXXX_");
@@ -802,7 +805,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                     sb.append("CI");
                     sb.append(stp.getNemCode());
 
-                    sbtable.append("NEM_");
+
                     sbtable.append("JSFW.");
                     sbtable.append(sb);
 
@@ -964,6 +967,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                             ProEconTestingPoint stp = gfpointls.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_G_XX_XX_XXXX_");
@@ -971,7 +975,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                             sb.append("CI");
                             sb.append(stp.getNemCode());
 
-                            sbtable.append("NEM_");
+
                             sbtable.append("JSFW.");
                             sbtable.append(sb);
 
@@ -1005,8 +1009,332 @@ 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<ProBasicCompany> companys = proBasicCompanyService.list().stream().filter(i -> i.getGroupId().equals(group.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);
+//                            if (cs.getId().equals("SXJ_KGDL_FLFD_ZGS") && stp.getTypeId().equals("gcc") || cs.getId().equals("SXJ_KGDL_GFFD_ZGS") && stp.getTypeId().equals("fcc") ||
+//                                    cs.getId().equals("NMM_KGDL_QH_ZGS") && stp.getTypeId().equals("gcc")|| cs.getIsAble().equals(2)) {
+//                                continue;
+//                            }
+//                            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("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(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(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());//逻辑表-fcc
+//                            po.setRealtimeId(String.valueOf(sbtable).substring(0,sbtable.indexOf(".")));
+//
+//                            points.add(po);
+//                        }
+//
+//                        allpoints.addAll(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(group.getId().substring(0, group.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(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(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);
+//                        /*******************************************风电测点生成*******************************************************/
+//
+//
+///*********************************************光伏测点生成*****************************************************/
+//                        sba = new StringBuilder();
+//                        sba.append(cs.getId().substring(0, cs.getId().lastIndexOf("_"))).append("_");
+//                        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;
+//                            }
+//                            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("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(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(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);
+//                    }
+//                }
+            }
+        }
 
 
         /*********************************************场站、项目、线路测点生成*****************************************************/

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/WindpowerstationPGService.java

@@ -141,8 +141,6 @@ public class WindpowerstationPGService implements BaseService<WindpowerstationPG
 
     @DataSource(value = DataSourceType.SLAVE)
     public List<Map> hso() {
-//        QueryWrapper<WindpowerstationPGPG> qw = new QueryWrapper<>();
-//        List<WindpowerstationPGPG> list = baseMapper.selectList(qw);
 
         List<WindpowerstationPG> list = new ArrayList<>();
         WindpowerstationPGExample example = new WindpowerstationPGExample();
@@ -564,49 +562,6 @@ public class WindpowerstationPGService implements BaseService<WindpowerstationPG
         Double sdfdsum = sdfdzjrl.stream().reduce(Double::sum).orElse((double) 0);
 
 
-        //产业
-//        tcjh.put("sxcygf", sxgf.size()); //45
-//        tcjh.put("sxcygfzjrl", MathUtil.twoBit(sxsum));
-//        tcjh.put("sxcyfd", sxfd.size());
-//        tcjh.put("sxcyfdzjrl", MathUtil.twoBit(sxfdsum));
-//        tcjh.put("sxcyzzjrl", MathUtil.twoBit(sxsum+sxfdsum));
-
-//        tcjh.put("xjcygf", xjgf.size());  //3
-//        tcjh.put("xjcygfzjrl", MathUtil.twoBit(xjsum));
-//        tcjh.put("xjcyfd", xjfd.size());
-//        tcjh.put("xjcyfdzjrl", MathUtil.twoBit(xjfdsum));
-//        tcjh.put("xjcyzzjrl", MathUtil.twoBit(xjsum+xjfdsum));
-
-        //"xs"为陕西
-//        tcjh.put("xscygf", xsgf.size());
-//        tcjh.put("xscygfzjrl", MathUtil.twoBit(xssum));
-//        tcjh.put("xscyfd", xsfd.size());
-//        tcjh.put("xscyfdzjrl", MathUtil.twoBit(xsfdsum));
-//        tcjh.put("xscyzzjrl", MathUtil.twoBit(xssum+xsfdsum));
-
-//        tcjh.put("nmcygf", nmgf.size());
-//        tcjh.put("nmcygfzjrl", MathUtil.twoBit(nmsum));
-//        tcjh.put("nmcyfd", nmfd.size());
-//        tcjh.put("nmcyfdzjrl", MathUtil.twoBit(nmfdsum));
-//        tcjh.put("nmcyzzjrl", MathUtil.twoBit(nmsum+nmfdsum));
-
-//        tcjh.put("hbcygf", hbgf.size());
-//        tcjh.put("hbcygfzjrl", MathUtil.twoBit(hbsum));
-//        tcjh.put("hbcyfd", hbfd.size());
-//        tcjh.put("hbcyfdzjrl", MathUtil.twoBit(hbfdsum));
-//        tcjh.put("hbcyzzjrl", MathUtil.twoBit(hbsum+hbfdsum));
-
-//        tcjh.put("xzcygf", xzgf.size());
-//        tcjh.put("xzcygfzjrl", MathUtil.twoBit(xzsum));
-//        tcjh.put("xzcyfd", xzfd.size());
-//        tcjh.put("xzcyfdzjrl", MathUtil.twoBit(xzfdsum));
-//        tcjh.put("xzcyzzjrl", MathUtil.twoBit(xzsum+xzfdsum));
-
-//        tcjh.put("sdcygf", sdgf.size());
-//        tcjh.put("sdcygfzjrl", MathUtil.twoBit(sdsum));
-//        tcjh.put("sdcyfd", sdfd.size());
-//        tcjh.put("sdcyfdzjrl", MathUtil.twoBit(sdfdsum));
-//        tcjh.put("sdcyzzjrl", MathUtil.twoBit(sdsum+sdfdsum));
         //清洁能源公司装机容量
         Double sxqjnysum = sxqjnygfzjrl.stream().reduce(Double::sum).orElse((double) 0);
         Double xjqjnysum = xjqjnygfzjrl.stream().reduce(Double::sum).orElse((double) 0);
@@ -627,48 +582,6 @@ public class WindpowerstationPGService implements BaseService<WindpowerstationPG
 
         //清洁能源公司
 
-//        tcjh.put("sxgsgf", sxqjnygf.size());
-//        tcjh.put("sxgsgfzjrl", MathUtil.twoBit(sxqjnysum));
-//        tcjh.put("sxgsfd", sxqjnyfd.size());
-//        tcjh.put("sxgsfdzjrl", MathUtil.twoBit(sxqjnyfdsum));
-//        tcjh.put("sxgszzjrl", MathUtil.twoBit(sxqjnysum+sxqjnyfdsum));
-
-//        tcjh.put("xjgsgf", xjqjnygf.size());
-//        tcjh.put("xjgsgfzjrl", MathUtil.twoBit(xjqjnysum));
-//        tcjh.put("xjgsfd", xjqjnyfd.size());
-//        tcjh.put("xjgsfdzjrl", MathUtil.twoBit(xjqjnyfdsum));
-//        tcjh.put("xjgszzjrl", MathUtil.twoBit(xjqjnysum+xjqjnyfdsum));
-//
-//        tcjh.put("xsgsgf", xsqjnygf.size());
-//        tcjh.put("xsgsgfzjrl", MathUtil.twoBit(xsqjnysum));
-//        tcjh.put("xsgsfd", xsqjnyfd.size());
-//        tcjh.put("xsgsfdzjrl", MathUtil.twoBit(xsqjnyfdsum));
-//        tcjh.put("xsgszzjrl", MathUtil.twoBit(xsqjnysum+xsqjnyfdsum));
-
-//        tcjh.put("nmgsgf", nmqjnygf.size());
-//        tcjh.put("nmgsgfzjrl", MathUtil.twoBit(nmqjnysum));
-//        tcjh.put("nmgsfd", nmqjnyfd.size());
-//        tcjh.put("nmgsfdzjrl", MathUtil.twoBit(nmqjnyfdsum));
-//        tcjh.put("nmgszzjrl", MathUtil.twoBit(nmqjnysum+nmqjnyfdsum));
-
-//        tcjh.put("hbgsgf", hbqjnygf.size());
-//        tcjh.put("hbgsgfzjrl", MathUtil.twoBit(hbqjnysum));
-//        tcjh.put("hbgsfd", hbqjnyfd.size());
-//        tcjh.put("hbgsfdzjrl", MathUtil.twoBit(hbqjnyfdsum));
-//        tcjh.put("hbgszzjrl", MathUtil.twoBit(hbqjnysum+hbqjnyfdsum));
-
-//        tcjh.put("xzgsgf", xzqjnygf.size());
-//        tcjh.put("xzgsgfzjrl", MathUtil.twoBit(xzqjnysum));
-//        tcjh.put("xzgsfd", xzqjnyfd.size());
-//        tcjh.put("xzgsfdzjrl", MathUtil.twoBit(xzqjnyfdsum));
-//        tcjh.put("xzgszzjrl", MathUtil.twoBit(xzqjnysum+xzqjnyfdsum));
-
-//        tcjh.put("sdgsgf", sdqjnygf.size());
-//        tcjh.put("sdgsgfzjrl", MathUtil.twoBit(sdqjnysum));
-//        tcjh.put("sdgsfd", sdqjnyfd.size());
-//        tcjh.put("sdgsfdzjrl", MathUtil.twoBit(sdqjnyfdsum));
-//        tcjh.put("sdgszjrl", MathUtil.twoBit(sdqjnysum+sdqjnyfdsum));
-
 
         Map<String, Object> tcsx = new LinkedHashMap<>();
         tcsx.put("name", "山西");