首页功能数据修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -238,20 +238,20 @@ public class MonitorService {
                 if (wp.getId().endsWith("FDC_STA") && CacheContext.wpmapls.containsKey(wp.getId())) {
                     List<ProBasicPowerstation> wpls = CacheContext.wpmapls.get(wp.getId());
                     for (ProBasicPowerstation wt : wpls) {
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.GZTSMX).getNemCode());    //故障台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.JXTSMX).getNemCode());    //检修台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.DJTSMX).getNemCode());//待机台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.SDTJTSMX).getNemCode());//手动停机台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XNTSMX).getNemCode());//性能台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XDTJTSMX).getNemCode());//限电停机台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.LXTSMX).getNemCode());//离线台数
-                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.GZTSMX).getNemCode());    //故障台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.JXTSMX).getNemCode());    //检修台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.DJTSMX).getNemCode());//待机台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.SDTJTSMX).getNemCode());//手动停机台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.XNTSMX).getNemCode());//性能台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.XDTJTSMX).getNemCode());//限电停机台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.LXTSMX).getNemCode());//离线台数
+                        fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
 
                         List<PointData> fjztlist = edosUtil.getRealData(fjztls);
 
@@ -274,20 +274,20 @@ public class MonitorService {
                 } else if (wp.getId().endsWith("GDC_STA") && CacheContext.wpmapls.containsKey(wp.getId())) {
                     List<ProBasicPowerstation> wtls = CacheContext.wpmapls.get(wp.getId());
                     for (ProBasicPowerstation wt : wtls) {
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.GZTSMX).getNemCode());    //故障台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.JXTSMX).getNemCode());    //检修台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.DJTSMX).getNemCode());//待机台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.SDTJTSMX).getNemCode());//手动停机台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XNTSMX).getNemCode());//性能台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XDTJTSMX).getNemCode());//限电停机台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.LXTSMX).getNemCode());//离线台数
-                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(),ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.GZTSMX).getNemCode());    //故障台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.JXTSMX).getNemCode());    //检修台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.DJTSMX).getNemCode());//待机台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.SDTJTSMX).getNemCode());//手动停机台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.XNTSMX).getNemCode());//性能台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.XDTJTSMX).getNemCode());//限电停机台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.LXTSMX).getNemCode());//离线台数
+                        gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wt.getId(), ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
 
                         List<PointData> gfztlist = edosUtil.getRealData(gfztls);
 
@@ -308,51 +308,51 @@ public class MonitorService {
                     }
                 }
 
-                    mxztmap.put("fd_dfnum", fd_dfnum);
-                    mxztmap.put("fd_sdtjnum", fd_sdtjnum);
-                    mxztmap.put("fd_zcfdnum", fd_zcfdnum);
-                    mxztmap.put("fd_jclyxnum", fd_jclyxnum);
-                    mxztmap.put("fd_gztjnum", fd_gztjnum);
-                    mxztmap.put("fd_gzcnslnum", fd_gzcnslnum);
-                    mxztmap.put("fd_jxtjnum", fd_jxtjnum);
-                    mxztmap.put("fd_jxclslnum", fd_jxclslnum);
-                    mxztmap.put("fd_xdjclnum", fd_xdjclnum);
-                    mxztmap.put("fd_tjnum", fd_tjnum);
-                    mxztmap.put("fd_sldwnum", fd_sldwnum);
-                    mxztmap.put("fd_slhjnum", fd_slhjnum);
-                    mxztmap.put("fd_wznum", fd_wznum);
-                    mxztmap.put("fd_lxnum", fd_lxnum);
-
-                    mxztmap.put("fd_djnum", fd_dfnum + fd_sdtjnum);
-                    mxztmap.put("fd_yxnum", fd_zcfdnum + fd_jclyxnum);
-                    mxztmap.put("fd_gznum", fd_gzcnslnum + fd_gztjnum);
-                    mxztmap.put("fd_jxnum", fd_jxtjnum + fd_jxclslnum);
-                    mxztmap.put("fd_xdnum", fd_xdjclnum + fd_tjnum);
-                    mxztmap.put("fd_slnum", fd_slhjnum + fd_sldwnum);
-                    mxztmap.put("fd_lxyznum", fd_wznum + fd_lxnum);
-
-                    mxztmap.put("gf_dfnum", gf_dfnum);
-                    mxztmap.put("gf_sdtjnum", gf_sdtjnum);
-                    mxztmap.put("gf_zcfdnum", gf_zcfdnum);
-                    mxztmap.put("gf_jclyxnum", gf_jclyxnum);
-                    mxztmap.put("gf_gztjnum", gf_gztjnum);
-                    mxztmap.put("gf_gzcnslnum", gf_gzcnslnum);
-                    mxztmap.put("gf_jxtjnum", gf_jxtjnum);
-                    mxztmap.put("gf_jxclslnum", gf_jxclslnum);
-                    mxztmap.put("gf_xdjclnum", gf_xdjclnum);
-                    mxztmap.put("gf_tjnum", gf_tjnum);
-                    mxztmap.put("gf_sldwnum", gf_sldwnum);
-                    mxztmap.put("gf_slhjnum", gf_slhjnum);
-                    mxztmap.put("gf_wznum", gf_wznum);
-                    mxztmap.put("gf_lxnum", gf_lxnum);
-
-                    mxztmap.put("gf_djnum", gf_dfnum + gf_sdtjnum);
-                    mxztmap.put("gf_yxnum", gf_zcfdnum + gf_jclyxnum);
-                    mxztmap.put("gf_gznum", gf_gzcnslnum + gf_gztjnum);
-                    mxztmap.put("gf_jxnum", gf_jxtjnum + gf_jxclslnum);
-                    mxztmap.put("gf_xdnum", gf_xdjclnum + gf_tjnum);
-                    mxztmap.put("gf_slnum", gf_slhjnum + gf_sldwnum);
-                    mxztmap.put("gf_lxyznum", gf_wznum + gf_lxnum);
+                mxztmap.put("fd_dfnum", fd_dfnum);
+                mxztmap.put("fd_sdtjnum", fd_sdtjnum);
+                mxztmap.put("fd_zcfdnum", fd_zcfdnum);
+                mxztmap.put("fd_jclyxnum", fd_jclyxnum);
+                mxztmap.put("fd_gztjnum", fd_gztjnum);
+                mxztmap.put("fd_gzcnslnum", fd_gzcnslnum);
+                mxztmap.put("fd_jxtjnum", fd_jxtjnum);
+                mxztmap.put("fd_jxclslnum", fd_jxclslnum);
+                mxztmap.put("fd_xdjclnum", fd_xdjclnum);
+                mxztmap.put("fd_tjnum", fd_tjnum);
+                mxztmap.put("fd_sldwnum", fd_sldwnum);
+                mxztmap.put("fd_slhjnum", fd_slhjnum);
+                mxztmap.put("fd_wznum", fd_wznum);
+                mxztmap.put("fd_lxnum", fd_lxnum);
+
+                mxztmap.put("fd_djnum", fd_dfnum + fd_sdtjnum);
+                mxztmap.put("fd_yxnum", fd_zcfdnum + fd_jclyxnum);
+                mxztmap.put("fd_gznum", fd_gzcnslnum + fd_gztjnum);
+                mxztmap.put("fd_jxnum", fd_jxtjnum + fd_jxclslnum);
+                mxztmap.put("fd_xdnum", fd_xdjclnum + fd_tjnum);
+                mxztmap.put("fd_slnum", fd_slhjnum + fd_sldwnum);
+                mxztmap.put("fd_lxyznum", fd_wznum + fd_lxnum);
+
+                mxztmap.put("gf_dfnum", gf_dfnum);
+                mxztmap.put("gf_sdtjnum", gf_sdtjnum);
+                mxztmap.put("gf_zcfdnum", gf_zcfdnum);
+                mxztmap.put("gf_jclyxnum", gf_jclyxnum);
+                mxztmap.put("gf_gztjnum", gf_gztjnum);
+                mxztmap.put("gf_gzcnslnum", gf_gzcnslnum);
+                mxztmap.put("gf_jxtjnum", gf_jxtjnum);
+                mxztmap.put("gf_jxclslnum", gf_jxclslnum);
+                mxztmap.put("gf_xdjclnum", gf_xdjclnum);
+                mxztmap.put("gf_tjnum", gf_tjnum);
+                mxztmap.put("gf_sldwnum", gf_sldwnum);
+                mxztmap.put("gf_slhjnum", gf_slhjnum);
+                mxztmap.put("gf_wznum", gf_wznum);
+                mxztmap.put("gf_lxnum", gf_lxnum);
+
+                mxztmap.put("gf_djnum", gf_dfnum + gf_sdtjnum);
+                mxztmap.put("gf_yxnum", gf_zcfdnum + gf_jclyxnum);
+                mxztmap.put("gf_gznum", gf_gzcnslnum + gf_gztjnum);
+                mxztmap.put("gf_jxnum", gf_jxtjnum + gf_jxclslnum);
+                mxztmap.put("gf_xdnum", gf_xdjclnum + gf_tjnum);
+                mxztmap.put("gf_slnum", gf_slhjnum + gf_sldwnum);
+                mxztmap.put("gf_lxyznum", gf_wznum + gf_lxnum);
 
 //                if (!fjztlist.isEmpty() && fjztlist.size() == fjztls.size()) {
 //                    for (int i = 0; i < fjztlist.size(); i++) {
@@ -515,7 +515,8 @@ public class MonitorService {
             /**********************************************首页安全天数、实时功率及节能减排等信息统计**********************************************************/
 
             Double zjrl = 0.0;
-            Double zjts = 0.0;
+            Double czyfdl = 0.0;
+            Double cznfdl = 0.0;
 
             double aqts = 0.0;
             double sjgl = 0.0;
@@ -623,6 +624,11 @@ public class MonitorService {
                         ProBasicPowerstationPoint gfglvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZGL);
                         gfsjgl += edosUtil.getRealData(gfglvalue).getPointValueInDouble();
                     }
+
+                    ProBasicPowerstationPoint czyfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
+                    czyfdl += edosUtil.getRealData(czyfdlvalue).getPointValueInDouble();
+                    ProBasicPowerstationPoint cznfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
+                    cznfdl += edosUtil.getRealData(cznfdlvalue).getPointValueInDouble();
                 }
 
             } else {
@@ -673,31 +679,43 @@ public class MonitorService {
                 ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
                 jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
 
+
             }
             List<ProBasicEnergyGroup> gpls = CacheContext.gpls;
             List<ProBasicRegion> rgls = CacheContext.rgls;
             List<ProBasicCompany> cpls = CacheContext.cpls;
 
-            for (ProBasicEnergyGroup gp : gpls){
+            for (ProBasicEnergyGroup gp : gpls) {
                 if (wpId.contains(gp.getId())) {
                     qt.put("fdzzjrl", gp.getWindCapacity() / 1000);
                     qt.put("gfzzjrl", gp.getCapacity() / 1000);
                     qt.put("zzjrl", (gp.getWindCapacity() + gp.getCapacity()) / 1000);
                 }
             }
-            for (ProBasicRegion rg : rgls){
+            for (ProBasicRegion rg : rgls) {
                 if (wpId.contains(rg.getId())) {
                     qt.put("fdzzjrl", rg.getJrwindCapacity() / 1000);
                     qt.put("gfzzjrl", rg.getJrCapacity() / 1000);
                     qt.put("zzjrl", (rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000);
+                    qt.put("ylyxs", (czyfdl/10000)/((rg.getJrwindCapacity() + rg.getJrCapacity())/ 1000));
+                    qt.put("nlyxs", (cznfdl/10000)/((rg.getJrwindCapacity() + rg.getJrCapacity())/ 1000));
                 }
             }
 
-            for (ProBasicCompany cp : cpls){
+            for (ProBasicCompany cp : cpls) {
                 if (wpId.contains(cp.getId())) {
                     qt.put("fdzzjrl", cp.getJrwindCapacity() / 1000);
                     qt.put("gfzzjrl", cp.getJrCapacity() / 1000);
                     qt.put("zzjrl", (cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000);
+                    qt.put("ylyxs", (czyfdl/10000)/((cp.getJrwindCapacity() + cp.getJrCapacity())/ 1000));
+                    qt.put("nlyxs", (cznfdl/10000)/((cp.getJrwindCapacity() + cp.getJrCapacity())/ 1000));
+                }
+            }
+            for (ProBasicPowerstation wp : wplist) {
+                if (wpId.contains(wp.getId())) {
+
+                    qt.put("ylyxs", (yfdl/10000)/((wp.getJrwindCapacity() + wp.getJrCapacity())/1000));
+                    qt.put("nlyxs", (nfdl/10000)/((wp.getJrwindCapacity() + wp.getJrCapacity())/1000));
                 }
             }
             qt.put("aqts", MathUtil.twoBit(aqts));
@@ -715,8 +733,6 @@ public class MonitorService {
             qt.put("fdsjgl", MathUtil.twoBit(fdsjgl));
             qt.put("gfsjgl", MathUtil.twoBit(gfsjgl));
 
-            qt.put("ylyxs", yfdl / (zjrl / 1000));
-            qt.put("nlyxs", nfdl / (zjrl / 1000));
 
 
 
@@ -843,7 +859,7 @@ public class MonitorService {
 
 
             /**********************************************首页弹窗**********************************************************/
-            List<ProBasicPowerstation> wpls = CacheContext.wpls;
+            List<ProBasicRegion> wpls = CacheContext.rgls;
             Map<String, Double> sxqyxx = new LinkedHashMap<>();
             Map<String, Double> nmqyxx = new LinkedHashMap<>();
             Map<String, Double> xjqyxx = new LinkedHashMap<>();
@@ -907,205 +923,124 @@ public class MonitorService {
             Double xzcygfzjrl = 0.0;
             double xzcygfcsl = 0;
 
-            if (!wpls.isEmpty()) {
-                //山西产业
-                List<ProBasicPowerstation> sxfdcy = wpls.stream().filter(wp -> wp.getRegionId().equals("SXJ_RGN") && wp.getId()
-                        .endsWith("FDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : sxfdcy) {
-                    sxcyfdzjrl += powerstation.getJrwindCapacity();
-                    sxcyfdcsl = sxfdcy.size();
-                }
-                List<ProBasicPowerstation> sxgfcy = wpls.stream().filter(wp -> wp.getRegionId().equals("SXJ_RGN") && wp.getId()
-                        .endsWith("GDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : sxgfcy) {
-                    sxcygfzjrl += powerstation.getJrCapacity();
-                    sxcygfcsl = sxgfcy.size();
-                }
-
-                //山西公司
-                List<ProBasicPowerstation> sxfdgs = wpls.stream().filter(wp -> wp.getRegionId().equals("SXJ_RGN") && wp.getId()
-                        .endsWith("FDC_STA") && wp.getCompanyId().endsWith("SXJ_KGDL_FLFD_ZGS")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : sxfdgs) {
-                    sxgsfdzjrl += powerstation.getJrwindCapacity();
-                    sxgsfdcsl = sxfdgs.size();
-                }
-
-                List<ProBasicPowerstation> sxgfgs = wpls.stream().filter(wp -> wp.getRegionId().equals("SXJ_RGN") && wp.getId()
-                        .endsWith("GDC_STA") && wp.getCompanyId().endsWith("SXJ_KGDL_GFFD_ZGS")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : sxgfgs) {
-                    sxgsgfzjrl += powerstation.getJrCapacity();
-                    sxgsgfcsl = sxgfgs.size();
-                }
-
-                sxqyxx.put("sxcyzzjrl", (sxcyfdzjrl + sxcygfzjrl) / 1000);
-                sxqyxx.put("sxcyfdzjrl", sxcyfdzjrl / 1000);
-                sxqyxx.put("sxcyfdcsl", StringUtils.round(sxcyfdcsl, 0));
-                sxqyxx.put("sxcygfzjrl", sxcygfzjrl / 1000);
-                sxqyxx.put("sxcygfcsl", sxcygfcsl);
-
-                sxqyxx.put("sxgszzjrl", (sxgsfdzjrl + sxgsgfzjrl) / 1000);
-                sxqyxx.put("sxgsfdzjrl", sxgsfdzjrl / 1000);
-                sxqyxx.put("sxgsfdcsl", StringUtils.round(sxgsfdcsl, 0));
-                sxqyxx.put("sxgsgfzjrl", sxgsgfzjrl / 1000);
-                sxqyxx.put("sxgsgfcsl", StringUtils.round(sxgsgfcsl, 0));
-                sytc.put("sxqyxx", sxqyxx);
-
-                //内蒙产业
-                List<ProBasicPowerstation> nmfdcy = wpls.stream().filter(wp -> wp.getRegionId().equals("NMM_RGN") && wp.getId()
-                        .endsWith("FDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : nmfdcy) {
-                    nmcyfdzjrl += powerstation.getJrwindCapacity();
-                    nmcyfdcsl = nmfdcy.size();
-                }
 
-                List<ProBasicPowerstation> nmgfcy = wpls.stream().filter(wp -> wp.getRegionId().equals("NMM_RGN") && wp.getId()
-                        .endsWith("GDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : nmgfcy) {
-                    nmcygfzjrl += powerstation.getJrCapacity();
-                    nmcygfcsl = nmgfcy.size();
-                }
+            for (ProBasicRegion reg : wpls) {
+                if (reg.getOrderNum().equals(1)) {
+                    sxcyfdcsl = reg.getWindNumber();
+                    sxcyfdzjrl = reg.getWindCapacity();
+                    sxcygfcsl = reg.getNumber();
+                    sxcygfzjrl = reg.getCapacity();
 
-                //内蒙公司
-                List<ProBasicPowerstation> nmfdgs = wpls.stream().filter(wp -> wp.getRegionId().equals("NMM_RGN") && wp.getId()
-                        .endsWith("FDC_STA") && wp.getCompanyId().endsWith("NMM_KGDL_QH_ZGS")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : nmfdgs) {
-                    nmgsfdzjrl += powerstation.getJrwindCapacity();
-                    nmgsfdcsl = nmfdgs.size();
+                    sxgsfdcsl = reg.getJrWindNumber();
+                    sxgsfdzjrl = reg.getJrwindCapacity();
+                    sxgsgfcsl = reg.getJrNumber();
+                    sxgsgfzjrl = reg.getJrCapacity();
                 }
-
-                List<ProBasicPowerstation> nmgfgs = wpls.stream().filter(wp -> wp.getRegionId().equals("NMM_RGN") && wp.getId()
-                        .endsWith("GDC_STA") && wp.getCompanyId().endsWith("NMM_KGDL_QH_ZGS")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : nmgfgs) {
-                    nmgsgfzjrl += powerstation.getJrCapacity();
-                    nmgsgfcsl = nmgfgs.size();
+                if (reg.getOrderNum().equals(4)) {
+                    hbcyfdcsl = reg.getWindNumber();
+                    hbcyfdzjrl = reg.getWindCapacity();
+                    hbcygfcsl = reg.getNumber();
+                    hbcygfzjrl = reg.getCapacity();
                 }
-
-                nmqyxx.put("nmcyzzjrl", (nmcyfdzjrl + nmcygfzjrl) / 1000);
-                nmqyxx.put("nmcyfdzjrl", nmcyfdzjrl / 1000);
-                nmqyxx.put("nmcyfdcsl", StringUtils.round(nmcyfdcsl, 0));
-                nmqyxx.put("nmcygfzjrl", nmcygfzjrl / 1000);
-                nmqyxx.put("nmcygfcsl", nmcygfcsl);
-
-                nmqyxx.put("nmgszzjrl", (nmgsfdzjrl + nmgsgfzjrl) / 1000);
-                nmqyxx.put("nmgsfdzjrl", nmgsfdzjrl / 1000);
-                nmqyxx.put("nmgsfdcsl", StringUtils.round(nmgsfdcsl, 0));
-                nmqyxx.put("nmgsgfzjrl", nmgsgfzjrl / 1000);
-                nmqyxx.put("nmgsgfcsl", StringUtils.round(nmgsgfcsl, 0));
-                sytc.put("nmqyxx", nmqyxx);
-
-
-                //新疆产业
-                List<ProBasicPowerstation> xjfdcy = wpls.stream().filter(wp -> wp.getRegionId().equals("XJX_RGN") && wp.getId()
-                        .endsWith("FDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : xjfdcy) {
-                    xjcyfdzjrl += powerstation.getJrwindCapacity();
-                    xjcyfdcsl = xjfdcy.size();
+                if (reg.getOrderNum().equals(3)) {
+                    xscyfdcsl = reg.getWindNumber();
+                    xscyfdzjrl = reg.getWindCapacity();
+                    xscygfcsl = reg.getNumber();
+                    xscygfzjrl = reg.getCapacity();
                 }
-
-                List<ProBasicPowerstation> xjgfcy = wpls.stream().filter(wp -> wp.getRegionId().equals("XJX_RGN") && wp.getId()
-                        .endsWith("GDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : xjgfcy) {
-                    xjcygfzjrl += powerstation.getJrCapacity();
-                    xjcygfcsl = xjgfcy.size();
+                if (reg.getOrderNum().equals(5)) {
+                    sdcyfdcsl = reg.getWindNumber();
+                    sdcyfdzjrl = reg.getWindCapacity();
+                    sdcygfcsl = reg.getNumber();
+                    sdcygfzjrl = reg.getCapacity();
                 }
-
-                xjqyxx.put("xjcyzzjrl", (xjcyfdzjrl + xjcygfzjrl) / 1000);
-                xjqyxx.put("xjcyfdzjrl", xjcyfdzjrl / 1000);
-                xjqyxx.put("xjcyfdcsl", StringUtils.round(xjcyfdcsl, 0));
-                xjqyxx.put("xjcygfzjrl", xjcygfzjrl / 1000);
-                xjqyxx.put("xjcygfcsl", xjcygfcsl);
-                sytc.put("xjqyxx", xjqyxx);
-
-
-                //河北产业
-                List<ProBasicPowerstation> hbfdcy = wpls.stream().filter(wp -> wp.getRegionId().equals("HBJ_RGN") && wp.getId()
-                        .endsWith("FDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : hbfdcy) {
-                    hbcyfdzjrl += powerstation.getJrwindCapacity();
-                    hbcyfdcsl = hbfdcy.size();
-                }
-
-                List<ProBasicPowerstation> hbgfcy = wpls.stream().filter(wp -> wp.getRegionId().equals("HBJ_RGN") && wp.getId()
-                        .endsWith("GDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : hbgfcy) {
-                    hbcygfzjrl += powerstation.getJrCapacity();
-                    hbcygfcsl = hbgfcy.size();
+                if (reg.getOrderNum().equals(6)) {
+                    xzcyfdcsl = reg.getWindNumber();
+                    xzcyfdzjrl = reg.getWindCapacity();
+                    xzcygfcsl = reg.getNumber();
+                    xzcygfzjrl = reg.getCapacity();
                 }
-
-                hbqyxx.put("hbcyzzjrl", (hbcyfdzjrl + hbcygfzjrl) / 1000);
-                hbqyxx.put("hbcyfdzjrl", hbcyfdzjrl / 1000);
-                hbqyxx.put("hbcyfdcsl", StringUtils.round(hbcyfdcsl, 0));
-                hbqyxx.put("hbcygfzjrl", hbcygfzjrl / 1000);
-                hbqyxx.put("hbcygfcsl", hbcygfcsl);
-                sytc.put("hbqyxx", hbqyxx);
-
-                //陕西产业
-                List<ProBasicPowerstation> xsfdcy = wpls.stream().filter(wp -> wp.getRegionId().equals("SXS_RGN") && wp.getId()
-                        .endsWith("FDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : xsfdcy) {
-                    xscyfdzjrl += powerstation.getJrwindCapacity();
-                    xscyfdcsl = xsfdcy.size();
+                if (reg.getOrderNum().equals(2)) {
+                    nmcyfdcsl = reg.getWindNumber();
+                    nmcyfdzjrl = reg.getWindCapacity();
+                    nmcygfcsl = reg.getNumber();
+                    nmcygfzjrl = reg.getCapacity();
+
+                    nmgsfdcsl = reg.getJrWindNumber();
+                    nmgsfdzjrl = reg.getJrwindCapacity();
+                    nmgsgfcsl = reg.getJrNumber();
+                    nmgsgfzjrl = reg.getJrCapacity();
                 }
-
-                List<ProBasicPowerstation> xsgfcy = wpls.stream().filter(wp -> wp.getRegionId().equals("SXS_RGN") && wp.getId()
-                        .endsWith("GDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : xsgfcy) {
-                    xscygfzjrl += powerstation.getJrCapacity();
-                    xscygfcsl = xsgfcy.size();
+                if (reg.getOrderNum().equals(7)) {
+                    xjcyfdcsl = reg.getWindNumber();
+                    xjcyfdzjrl = reg.getWindCapacity();
+                    xjcygfcsl = reg.getNumber();
+                    xjcygfzjrl = reg.getCapacity();
                 }
 
-                xsqyxx.put("xscyzzjrl", (xscyfdzjrl + xscygfzjrl) / 1000);
-                xsqyxx.put("xscyfdzjrl", xscyfdzjrl / 1000);
-                xsqyxx.put("xscyfdcsl", StringUtils.round(xscyfdcsl, 0));
-                xsqyxx.put("xscygfzjrl", xscygfzjrl / 1000);
-                xsqyxx.put("xscygfcsl", xscygfcsl);
-                sytc.put("xsqyxx", xsqyxx);
-
-                //山东产业
-                List<ProBasicPowerstation> sdfdcy = wpls.stream().filter(wp -> wp.getRegionId().equals("SDL_RGN") && wp.getId()
-                        .endsWith("FDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : sdfdcy) {
-                    sdcyfdzjrl += powerstation.getJrwindCapacity();
-                    sdcyfdcsl = sdfdcy.size();
-                }
-
-                List<ProBasicPowerstation> sdgfcy = wpls.stream().filter(wp -> wp.getRegionId().equals("SDL_RGN") && wp.getId()
-                        .endsWith("GDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : sdgfcy) {
-                    sdcygfzjrl += powerstation.getJrCapacity();
-                    sdcygfcsl = sdgfcy.size();
-                }
+            }
 
-                sdqyxx.put("sdcyzzjrl", (sdcyfdzjrl + sdcygfzjrl) / 1000);
-                sdqyxx.put("sdcyfdzjrl", sdcyfdzjrl / 1000);
-                sdqyxx.put("sdcyfdcsl", StringUtils.round(sdcyfdcsl, 0));
-                sdqyxx.put("sdcygfzjrl", sdcygfzjrl / 1000);
-                sdqyxx.put("sdcygfcsl", sdcygfcsl);
-                sytc.put("sdqyxx", sdqyxx);
 
-
-                //西藏产业
-                List<ProBasicPowerstation> xzfdcy = wpls.stream().filter(wp -> wp.getRegionId().equals("XZZ_RGN") && wp.getId()
-                        .endsWith("FDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : xzfdcy) {
-                    xzcyfdzjrl += powerstation.getJrwindCapacity();
-                    xzcyfdcsl = xzfdcy.size();
-                }
-
-                List<ProBasicPowerstation> xzgfcy = wpls.stream().filter(wp -> wp.getRegionId().equals("XZZ_RGN") && wp.getId()
-                        .endsWith("GDC_STA")).collect(Collectors.toList());
-                for (ProBasicPowerstation powerstation : xzgfcy) {
-                    xzcygfzjrl += powerstation.getJrCapacity();
-                    xzcygfcsl = xzgfcy.size();
-                }
-
-                xzqyxx.put("xzcyzzjrl", (xzcyfdzjrl + xzcygfzjrl) / 1000);
-                xzqyxx.put("xzcyfdzjrl", xzcyfdzjrl / 1000);
-                xzqyxx.put("xzcyfdcsl", StringUtils.round(xzcyfdcsl, 0));
-                xzqyxx.put("xzcygfzjrl", xzcygfzjrl / 1000);
-                xzqyxx.put("xzcygfcsl", xzcygfcsl);
-                sytc.put("xzqyxx", xzqyxx);
-            }
+            sxqyxx.put("sxcyzzjrl", (sxcyfdzjrl + sxcygfzjrl) / 1000);
+            sxqyxx.put("sxcyfdzjrl", sxcyfdzjrl / 1000);
+            sxqyxx.put("sxcyfdcsl", StringUtils.round(sxcyfdcsl, 0));
+            sxqyxx.put("sxcygfzjrl", sxcygfzjrl / 1000);
+            sxqyxx.put("sxcygfcsl", sxcygfcsl);
+
+            sxqyxx.put("sxgszzjrl", (sxgsfdzjrl + sxgsgfzjrl) / 1000);
+            sxqyxx.put("sxgsfdzjrl", sxgsfdzjrl / 1000);
+            sxqyxx.put("sxgsfdcsl", StringUtils.round(sxgsfdcsl, 0));
+            sxqyxx.put("sxgsgfzjrl", sxgsgfzjrl / 1000);
+            sxqyxx.put("sxgsgfcsl", StringUtils.round(sxgsgfcsl, 0));
+            sytc.put("sxqyxx", sxqyxx);
+
+            nmqyxx.put("nmcyzzjrl", (nmcyfdzjrl + nmcygfzjrl) / 1000);
+            nmqyxx.put("nmcyfdzjrl", nmcyfdzjrl / 1000);
+            nmqyxx.put("nmcyfdcsl", StringUtils.round(nmcyfdcsl, 0));
+            nmqyxx.put("nmcygfzjrl", nmcygfzjrl / 1000);
+            nmqyxx.put("nmcygfcsl", nmcygfcsl);
+
+            nmqyxx.put("nmgszzjrl", (nmgsfdzjrl + nmgsgfzjrl) / 1000);
+            nmqyxx.put("nmgsfdzjrl", nmgsfdzjrl / 1000);
+            nmqyxx.put("nmgsfdcsl", StringUtils.round(nmgsfdcsl, 0));
+            nmqyxx.put("nmgsgfzjrl", nmgsgfzjrl / 1000);
+            nmqyxx.put("nmgsgfcsl", StringUtils.round(nmgsgfcsl, 0));
+            sytc.put("nmqyxx", nmqyxx);
+
+            xjqyxx.put("xjcyzzjrl", (xjcyfdzjrl + xjcygfzjrl) / 1000);
+            xjqyxx.put("xjcyfdzjrl", xjcyfdzjrl / 1000);
+            xjqyxx.put("xjcyfdcsl", StringUtils.round(xjcyfdcsl, 0));
+            xjqyxx.put("xjcygfzjrl", xjcygfzjrl / 1000);
+            xjqyxx.put("xjcygfcsl", xjcygfcsl);
+            sytc.put("xjqyxx", xjqyxx);
+
+            hbqyxx.put("hbcyzzjrl", (hbcyfdzjrl + hbcygfzjrl) / 1000);
+            hbqyxx.put("hbcyfdzjrl", hbcyfdzjrl / 1000);
+            hbqyxx.put("hbcyfdcsl", StringUtils.round(hbcyfdcsl, 0));
+            hbqyxx.put("hbcygfzjrl", hbcygfzjrl / 1000);
+            hbqyxx.put("hbcygfcsl", hbcygfcsl);
+            sytc.put("hbqyxx", hbqyxx);
+
+            xsqyxx.put("xscyzzjrl", (xscyfdzjrl + xscygfzjrl) / 1000);
+            xsqyxx.put("xscyfdzjrl", xscyfdzjrl / 1000);
+            xsqyxx.put("xscyfdcsl", StringUtils.round(xscyfdcsl, 0));
+            xsqyxx.put("xscygfzjrl", xscygfzjrl / 1000);
+            xsqyxx.put("xscygfcsl", xscygfcsl);
+            sytc.put("xsqyxx", xsqyxx);
+
+            sdqyxx.put("sdcyzzjrl", (sdcyfdzjrl + sdcygfzjrl) / 1000);
+            sdqyxx.put("sdcyfdzjrl", sdcyfdzjrl / 1000);
+            sdqyxx.put("sdcyfdcsl", StringUtils.round(sdcyfdcsl, 0));
+            sdqyxx.put("sdcygfzjrl", sdcygfzjrl / 1000);
+            sdqyxx.put("sdcygfcsl", sdcygfcsl);
+            sytc.put("sdqyxx", sdqyxx);
+
+            xzqyxx.put("xzcyzzjrl", (xzcyfdzjrl + xzcygfzjrl) / 1000);
+            xzqyxx.put("xzcyfdzjrl", xzcyfdzjrl / 1000);
+            xzqyxx.put("xzcyfdcsl", StringUtils.round(xzcyfdcsl, 0));
+            xzqyxx.put("xzcygfzjrl", xzcygfzjrl / 1000);
+            xzqyxx.put("xzcygfcsl", xzcygfcsl);
+            sytc.put("xzqyxx", xzqyxx);
 
 
             map.put("sytc", sytc);
@@ -1159,10 +1094,12 @@ public class MonitorService {
 
             Map<String, Double> cblpoint = new LinkedHashMap<>();
 
-            if (wpId.contains("KGDL_FGS")) {
 
-                if (!cplist.isEmpty()) {
-                    for (ProBasicCompany pg : cplist) {
+            if (!cplist.isEmpty()) {
+                for (ProBasicCompany pg : cplist) {
+
+                    //集团
+                    if (wpId.contains("KGDL_FGS")) {
 
                         //清洁能源风电装机容量
                         qjny_fd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
@@ -1193,144 +1130,146 @@ public class MonitorService {
                         //接入光伏集中数量
                         jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
 
-                        if (pg.getId().contains("FLFD")) {
-                            //风电装机容量
-                            flfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
-                            //接入风电装机容量
-                            jr_flfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
-                            //风场数量
-                            flfd_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
-                            //接入风场数量
-                            jr_flfdfcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
-                            //风机数量
-                            flfdfj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
-                            //接入风机数量
-                            jr_flfdfj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
-                        } else if (pg.getId().contains("GFFD")) {
-                            //清洁能源光伏装机容量
-                            gffd_zjrl += null != pg.getCapacity() ? pg.getCapacity() : 0.0;
-                            //接入光伏装机容量
-                            jr_gffd_zjrl += null != pg.getJrCapacity() ? pg.getJrCapacity() : 0.0;
-                            //清洁能源光伏电站数量
-                            gffdts += null != pg.getNumber() ? pg.getNumber() : 0.0;
-                            //接入光伏电站数量
-                            jr_gffdts += null != pg.getJrNumber() ? pg.getJrNumber() : 0.0;
-                            //清洁能源光伏组串数量
-                            gffd_zcts += null != pg.getQuantityZc() ? pg.getQuantityZc() : 0.0;
-                            //清洁能源光伏集中数量
-                            gffd_jzts += null != pg.getQuantityJz() ? pg.getQuantityJz() : 0.0;
-                            //接入光伏组串数量
-                            jr_gffd_zcts += null != pg.getJrquantityZc() ? pg.getJrquantityZc() : 0.0;
-                            //接入光伏集中数量
-                            jr_gffd_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
-
-                        } else if (pg.getId().contains("QH")) {
-
-                            //七和风电装机容量
-                            qhfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
-                            //接入七和风电装机容量
-                            jr_qhfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
-                            //七和风场数量
-                            qhfd_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
-                            //接入七和风场数量
-                            jr_qhfdfcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
-                            //七和风机数量
-                            qhfdfj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
-                            //接入七和风机数量
-                            jr_qhfdfj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
-                        }
+                        cblpoint.put("qjny_fd_zjrl", StringUtils.round(qjny_fd_zjrl / 1000, 2));
+                        cblpoint.put("qjny_gf_zjrl", StringUtils.round(qjny_gf_zjrl / 1000, 2));
+                        cblpoint.put("qjny_zzjrl", StringUtils.round((qjny_gf_zjrl + qjny_fd_zjrl) / 1000, 2));
+                        cblpoint.put("jr_fd_zjrl", StringUtils.round(jr_fd_zjrl / 1000, 2));
+                        cblpoint.put("jr_gf_zjrl", StringUtils.round(jr_gf_zjrl / 1000, 2));
+                        cblpoint.put("jr_zzjrl", StringUtils.round((jr_gf_zjrl + jr_fd_zjrl) / 1000, 2));
+                        cblpoint.put("qjny_fcts", StringUtils.round(qjny_fcts, 2));
+                        cblpoint.put("qjny_gfts", StringUtils.round(qjny_gfts, 2));
+                        cblpoint.put("jr_fcts", StringUtils.round(jr_fcts, 2));
+                        cblpoint.put("jr_gfts", StringUtils.round(jr_gfts, 2));
+                        cblpoint.put("qjny_fj_ts", StringUtils.round(qjny_fj_ts, 2));
+                        cblpoint.put("qjny_gf_zcts", StringUtils.round(qjny_gf_zcts, 2));
+                        cblpoint.put("qjny_gf_jzts", StringUtils.round(qjny_gf_jzts, 2));
+                        cblpoint.put("jr_fj_ts", StringUtils.round(jr_fj_ts, 2));
+                        cblpoint.put("jr_gf_zcts", StringUtils.round(jr_gf_zcts, 2));
+                        cblpoint.put("jr_gf_jzts", StringUtils.round(jr_gf_jzts, 2));
+
+                    } else if (wpId.contains(pg.getId()) && pg.getOrderNum().equals(1)) {  //风电公司
+                        //风电装机容量
+                        flfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        //接入风电装机容量
+                        jr_flfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        //风场数量
+                        flfd_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
+                        //接入风场数量
+                        jr_flfdfcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
+                        //风机数量
+                        flfdfj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
+                        //接入风机数量
+                        jr_flfdfj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
+
 
+                        //风力发电公司
+                        cblpoint.put("qjny_fd_zjrl", StringUtils.round(flfd_zjrl / 1000, 2));
+                        cblpoint.put("jr_fd_zjrl", StringUtils.round(jr_flfd_zjrl / 1000, 2));
+                        cblpoint.put("qjny_fcts", StringUtils.round(flfd_fcts, 2));
+                        cblpoint.put("jr_fcts", StringUtils.round(jr_flfdfcts, 2));
+                        cblpoint.put("qjny_fj_ts", StringUtils.round(flfdfj_ts, 2));
+                        cblpoint.put("jr_fj_ts", StringUtils.round(jr_flfdfj_ts, 2));
+
+                    } else if (wpId.contains(pg.getId()) && pg.getOrderNum().equals(3)) {   //光伏公司
+                        //清洁能源光伏装机容量
+                        gffd_zjrl += null != pg.getCapacity() ? pg.getCapacity() : 0.0;
+                        //接入光伏装机容量
+                        jr_gffd_zjrl += null != pg.getJrCapacity() ? pg.getJrCapacity() : 0.0;
+                        //清洁能源光伏电站数量
+                        gffdts += null != pg.getNumber() ? pg.getNumber() : 0.0;
+                        //接入光伏电站数量
+                        jr_gffdts += null != pg.getJrNumber() ? pg.getJrNumber() : 0.0;
+                        //清洁能源光伏组串数量
+                        gffd_zcts += null != pg.getQuantityZc() ? pg.getQuantityZc() : 0.0;
+                        //清洁能源光伏集中数量
+                        gffd_jzts += null != pg.getQuantityJz() ? pg.getQuantityJz() : 0.0;
+                        //接入光伏组串数量
+                        jr_gffd_zcts += null != pg.getJrquantityZc() ? pg.getJrquantityZc() : 0.0;
+                        //接入光伏集中数量
+                        jr_gffd_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
+
+                        //光伏发电公司
+                        cblpoint.put("qjny_gf_zjrl", StringUtils.round(gffd_zjrl / 1000, 2));
+                        cblpoint.put("jr_gf_zjrl", StringUtils.round(jr_gffd_zjrl / 1000, 2));
+                        cblpoint.put("qjny_gfts", StringUtils.round(gffdts, 2));
+                        cblpoint.put("jr_gfts", StringUtils.round(jr_gffdts, 2));
+                        cblpoint.put("qjny_gf_jzts", StringUtils.round(gffd_jzts, 2));
+                        cblpoint.put("qjny_gf_zcts", StringUtils.round(gffd_zcts, 2));
+                        cblpoint.put("jr_gf_zcts", StringUtils.round(jr_gffd_zcts, 2));
+                        cblpoint.put("jr_gf_jzts", StringUtils.round(jr_gffd_jzts, 2));
+
+                    } else if (wpId.contains(pg.getId()) && pg.getOrderNum().equals(2)) {  //七和
+
+                        //七和风电装机容量
+                        qhfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        //接入七和风电装机容量
+                        jr_qhfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        //七和风场数量
+                        qhfd_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
+                        //接入七和风场数量
+                        jr_qhfdfcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
+                        //七和风机数量
+                        qhfdfj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
+                        //接入七和风机数量
+                        jr_qhfdfj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
+
+                        //七和发电公司
+                        cblpoint.put("qhfd_zjrl", StringUtils.round(qhfd_zjrl / 1000, 2));
+                        cblpoint.put("jr_qhfd_zjrl", StringUtils.round(jr_qhfd_zjrl / 1000, 2));
+                        cblpoint.put("qhfd_fcts", StringUtils.round(qhfd_fcts, 2));
+                        cblpoint.put("jr_qhfdfcts", StringUtils.round(jr_qhfdfcts, 2));
+                        cblpoint.put("qhfdfj_ts", StringUtils.round(qhfdfj_ts, 2));
+                        cblpoint.put("jr_qhfdfj_ts", StringUtils.round(jr_qhfdfj_ts, 2));
                     }
-                }
 
-                cblpoint.put("qjny_fd_zjrl", StringUtils.round(qjny_fd_zjrl, 2));
-                cblpoint.put("qjny_gf_zjrl", StringUtils.round(qjny_gf_zjrl, 2));
-                cblpoint.put("qjny_zzjrl", StringUtils.round(qjny_gf_zjrl + qjny_fd_zjrl, 2));
-                cblpoint.put("jr_fd_zjrl", StringUtils.round(jr_fd_zjrl, 2));
-                cblpoint.put("jr_gf_zjrl", StringUtils.round(jr_gf_zjrl, 2));
-                cblpoint.put("jr_zzjrl", StringUtils.round(jr_gf_zjrl + jr_fd_zjrl, 2));
-                cblpoint.put("qjny_fcts", StringUtils.round(qjny_fcts, 2));
-                cblpoint.put("qjny_gfts", StringUtils.round(qjny_gfts, 2));
-                cblpoint.put("jr_fcts", StringUtils.round(jr_fcts, 2));
-                cblpoint.put("jr_gfts", StringUtils.round(jr_gfts, 2));
-                cblpoint.put("qjny_fj_ts", StringUtils.round(qjny_fj_ts, 2));
-                cblpoint.put("qjny_gf_zcts", StringUtils.round(qjny_gf_zcts, 2));
-                cblpoint.put("qjny_gf_jzts", StringUtils.round(qjny_gf_jzts, 2));
-                cblpoint.put("jr_fj_ts", StringUtils.round(jr_fj_ts, 2));
-                cblpoint.put("jr_gf_zcts", StringUtils.round(jr_gf_zcts, 2));
-                cblpoint.put("jr_gf_jzts", StringUtils.round(jr_gf_jzts, 2));
+                }
 
-                //风力发电公司
-                cblpoint.put("flfd_zjrl", StringUtils.round(flfd_zjrl, 2));
-                cblpoint.put("jr_flfd_zjrl", StringUtils.round(jr_flfd_zjrl, 2));
-                cblpoint.put("flfd_fcts", StringUtils.round(flfd_fcts, 2));
-                cblpoint.put("jr_flfdfcts", StringUtils.round(jr_flfdfcts, 2));
-                cblpoint.put("flfdfj_ts", StringUtils.round(flfdfj_ts, 2));
-                cblpoint.put("jr_flfdfj_ts", StringUtils.round(jr_flfdfj_ts, 2));
-
-                //光伏发电公司
-                cblpoint.put("gffd_zjrl", StringUtils.round(gffd_zjrl, 2));
-                cblpoint.put("jr_gffd_zjrl", StringUtils.round(jr_gffd_zjrl, 2));
-                cblpoint.put("gffdts", StringUtils.round(gffdts, 2));
-                cblpoint.put("jr_gffdts", StringUtils.round(jr_gffdts, 2));
-                cblpoint.put("gffd_jzts", StringUtils.round(gffd_jzts, 2));
-                cblpoint.put("gffd_zcts", StringUtils.round(gffd_zcts, 2));
-                cblpoint.put("jr_gffd_zcts", StringUtils.round(jr_gffd_zcts, 2));
-                cblpoint.put("jr_gffd_jzts", StringUtils.round(jr_gffd_jzts, 2));
-
-                //七和发电公司
-                cblpoint.put("qhfd_zjrl", StringUtils.round(qhfd_zjrl, 2));
-                cblpoint.put("jr_qhfd_zjrl", StringUtils.round(jr_qhfd_zjrl, 2));
-                cblpoint.put("qhfd_fcts", StringUtils.round(qhfd_fcts, 2));
-                cblpoint.put("jr_qhfdfcts", StringUtils.round(jr_qhfdfcts, 2));
-                cblpoint.put("qhfdfj_ts", StringUtils.round(qhfdfj_ts, 2));
-                cblpoint.put("jr_qhfdfj_ts", StringUtils.round(jr_qhfdfj_ts, 2));
-
-            } else if (wpId.contains("SXJ_RGN")) {
+            }
+            if (wpId.contains("SXJ_RGN")) {
 
                 List<ProBasicCompany> sxj_rgn = cplist.stream().filter(i -> i.getRegionId().equals("SXJ_RGN")).collect(Collectors.toList());
 
                 if (!cplist.isEmpty()) {
 
-                    for (ProBasicCompany pg : sxj_rgn) {
+                    for (ProBasicCompany pg1 : sxj_rgn) {
 
                         //清洁能源风电装机容量
-                        qjny_fd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        qjny_fd_zjrl += null != pg1.getWindCapacity() ? pg1.getWindCapacity() : 0.0;
                         //清洁能源光伏装机容量
-                        qjny_gf_zjrl += null != pg.getCapacity() ? pg.getCapacity() : 0.0;
+                        qjny_gf_zjrl += null != pg1.getCapacity() ? pg1.getCapacity() : 0.0;
                         //接入风电装机容量
-                        jr_fd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        jr_fd_zjrl += null != pg1.getWindCapacity() ? pg1.getWindCapacity() : 0.0;
                         //接入光伏装机容量
-                        jr_gf_zjrl += null != pg.getJrCapacity() ? pg.getJrCapacity() : 0.0;
+                        jr_gf_zjrl += null != pg1.getJrCapacity() ? pg1.getJrCapacity() : 0.0;
                         //清洁能源风场数量
-                        qjny_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
+                        qjny_fcts += null != pg1.getWindNumber() ? pg1.getWindNumber() : 0.0;
                         //清洁能源光伏电站数量
-                        qjny_gfts += null != pg.getNumber() ? pg.getNumber() : 0.0;
+                        qjny_gfts += null != pg1.getNumber() ? pg1.getNumber() : 0.0;
                         //接入风场数量
-                        jr_fcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
+                        jr_fcts += null != pg1.getJrWindNumber() ? pg1.getJrWindNumber() : 0.0;
                         //接入光伏电站数量
-                        jr_gfts += null != pg.getJrNumber() ? pg.getJrNumber() : 0.0;
+                        jr_gfts += null != pg1.getJrNumber() ? pg1.getJrNumber() : 0.0;
                         //清洁能源风机数量
-                        qjny_fj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
+                        qjny_fj_ts += null != pg1.getWindQuantityLd() ? pg1.getWindQuantityLd() : 0.0;
                         //清洁能源光伏组串数量
-                        qjny_gf_zcts += null != pg.getQuantityZc() ? pg.getQuantityZc() : 0.0;
+                        qjny_gf_zcts += null != pg1.getQuantityZc() ? pg1.getQuantityZc() : 0.0;
                         //清洁能源光伏集中数量
-                        qjny_gf_jzts += null != pg.getQuantityJz() ? pg.getQuantityJz() : 0.0;
+                        qjny_gf_jzts += null != pg1.getQuantityJz() ? pg1.getQuantityJz() : 0.0;
                         //接入风机数量
-                        jr_fj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
+                        jr_fj_ts += null != pg1.getJrwindQuantityLd() ? pg1.getJrwindQuantityLd() : 0.0;
                         //接入光伏组串数量
-                        jr_gf_zcts += null != pg.getJrquantityZc() ? pg.getJrquantityZc() : 0.0;
+                        jr_gf_zcts += null != pg1.getJrquantityZc() ? pg1.getJrquantityZc() : 0.0;
                         //接入光伏集中数量
-                        jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
+                        jr_gf_jzts += null != pg1.getJrquantityJz() ? pg1.getJrquantityJz() : 0.0;
 
                     }
                 }
-                cblpoint.put("qjny_fd_zjrl", StringUtils.round(qjny_fd_zjrl, 2));
-                cblpoint.put("qjny_gf_zjrl", StringUtils.round(qjny_gf_zjrl, 2));
-                cblpoint.put("qjny_zzjrl", StringUtils.round(qjny_gf_zjrl + qjny_fd_zjrl, 2));
-                cblpoint.put("jr_fd_zjrl", StringUtils.round(jr_fd_zjrl, 2));
-                cblpoint.put("jr_gf_zjrl", StringUtils.round(jr_gf_zjrl, 2));
-                cblpoint.put("jr_zzjrl", StringUtils.round(jr_gf_zjrl + jr_fd_zjrl, 2));
+                cblpoint.put("qjny_fd_zjrl", StringUtils.round(qjny_fd_zjrl / 1000, 2));
+                cblpoint.put("qjny_gf_zjrl", StringUtils.round(qjny_gf_zjrl / 1000, 2));
+                cblpoint.put("qjny_zzjrl", StringUtils.round((qjny_gf_zjrl + qjny_fd_zjrl) / 1000, 2));
+                cblpoint.put("jr_fd_zjrl", StringUtils.round(jr_fd_zjrl / 1000, 2));
+                cblpoint.put("jr_gf_zjrl", StringUtils.round(jr_gf_zjrl / 1000, 2));
+                cblpoint.put("jr_zzjrl", StringUtils.round((jr_gf_zjrl + jr_fd_zjrl) / 1000, 2));
                 cblpoint.put("qjny_fcts", StringUtils.round(qjny_fcts, 2));
                 cblpoint.put("qjny_gfts", StringUtils.round(qjny_gfts, 2));
                 cblpoint.put("jr_fcts", StringUtils.round(jr_fcts, 2));
@@ -1341,44 +1280,53 @@ public class MonitorService {
                 cblpoint.put("jr_fj_ts", StringUtils.round(jr_fj_ts, 2));
                 cblpoint.put("jr_gf_zcts", StringUtils.round(jr_gf_zcts, 2));
                 cblpoint.put("jr_gf_jzts", StringUtils.round(jr_gf_jzts, 2));
+
             }
+
+
             for (ProBasicPowerstation wp : wplist) {
-                if (wp.getId().equals(wpId)) {
+                if (wpId.contains(wp.getId()) && wp.getSpare4().equals("1")) {
                     //清洁能源风电装机容量
                     qjny_fd_zjrl += null != wp.getWindCapacity() ? wp.getWindCapacity() : 0.0;
-                    //清洁能源光伏装机容量
-                    qjny_gf_zjrl += null != wp.getCapacity() ? wp.getCapacity() : 0.0;
+
                     //接入风电装机容量
                     jr_fd_zjrl += null != wp.getWindCapacity() ? wp.getWindCapacity() : 0.0;
-                    //接入光伏装机容量
-                    jr_gf_zjrl += null != wp.getJrCapacity() ? wp.getJrCapacity() : 0.0;
+
                     //清洁能源风机数量
                     qjny_fj_ts += null != wp.getWindQuantityLd() ? wp.getWindQuantityLd() : 0.0;
+
+                    //接入风机数量
+                    jr_fj_ts += null != wp.getJrwindQuantityLd() ? wp.getJrwindQuantityLd() : 0.0;
+
+                    cblpoint.put("qjny_fd_zjrl", StringUtils.round(qjny_fd_zjrl / 1000, 2));
+                    cblpoint.put("jr_fd_zjrl", StringUtils.round(jr_fd_zjrl / 1000, 2));
+                    cblpoint.put("qjny_fj_ts", StringUtils.round(qjny_fj_ts, 2));
+                    cblpoint.put("jr_fj_ts", StringUtils.round(jr_fj_ts, 2));
+                }else if (wpId.contains(wp.getId()) && wp.getSpare4().equals("2")){
+
+                    //清洁能源光伏装机容量
+                    qjny_gf_zjrl += null != wp.getCapacity() ? wp.getCapacity() : 0.0;
+                    //接入光伏装机容量
+                    jr_gf_zjrl += null != wp.getJrCapacity() ? wp.getJrCapacity() : 0.0;
                     //清洁能源光伏组串数量
                     qjny_gf_zcts += null != wp.getQuantityZc() ? wp.getQuantityZc() : 0.0;
                     //清洁能源光伏集中数量
                     qjny_gf_jzts += null != wp.getQuantityJz() ? wp.getQuantityJz() : 0.0;
-                    //接入风机数量
-                    jr_fj_ts += null != wp.getJrwindQuantityLd() ? wp.getJrwindQuantityLd() : 0.0;
                     //接入光伏组串数量
                     jr_gf_zcts += null != wp.getJrquantityZc() ? wp.getJrquantityZc() : 0.0;
                     //接入光伏集中数量
                     jr_gf_jzts += null != wp.getJrquantityJz() ? wp.getJrquantityJz() : 0.0;
+
+                    cblpoint.put("qjny_gf_zjrl", StringUtils.round(qjny_gf_zjrl / 1000, 2));
+                    cblpoint.put("jr_gf_zjrl", StringUtils.round(jr_gf_zjrl / 1000, 2));
+                    cblpoint.put("qjny_gf_zcts", StringUtils.round(qjny_gf_zcts, 2));
+                    cblpoint.put("qjny_gf_jzts", StringUtils.round(qjny_gf_jzts, 2));
+                    cblpoint.put("jr_gf_zcts", StringUtils.round(jr_gf_zcts, 2));
+                    cblpoint.put("jr_gf_jzts", StringUtils.round(jr_gf_jzts, 2));
+
                 }
-            }
-            cblpoint.put("qjny_fd_zjrl", StringUtils.round(qjny_fd_zjrl, 2));
-            cblpoint.put("qjny_gf_zjrl", StringUtils.round(qjny_gf_zjrl, 2));
-            cblpoint.put("qjny_zzjrl", StringUtils.round(qjny_gf_zjrl + qjny_fd_zjrl, 2));
-            cblpoint.put("jr_fd_zjrl", StringUtils.round(jr_fd_zjrl, 2));
-            cblpoint.put("jr_gf_zjrl", StringUtils.round(jr_gf_zjrl, 2));
-            cblpoint.put("jr_zzjrl", StringUtils.round(jr_gf_zjrl + jr_fd_zjrl, 2));
-            cblpoint.put("qjny_fj_ts", StringUtils.round(qjny_fj_ts, 2));
-            cblpoint.put("qjny_gf_zcts", StringUtils.round(qjny_gf_zcts, 2));
-            cblpoint.put("qjny_gf_jzts", StringUtils.round(qjny_gf_jzts, 2));
-            cblpoint.put("jr_fj_ts", StringUtils.round(jr_fj_ts, 2));
-            cblpoint.put("jr_gf_zcts", StringUtils.round(jr_gf_zcts, 2));
-            cblpoint.put("jr_gf_jzts", StringUtils.round(jr_gf_jzts, 2));
 
+            }
 
             map.put("cblpoint", cblpoint);
 
@@ -1529,7 +1477,7 @@ public class MonitorService {
         Date oneDate = oneyear.getTime();
 
         Calendar currentyear = Calendar.getInstance();
-        currentyear.add(Calendar.YEAR,0);
+        currentyear.add(Calendar.YEAR, 0);
         Date currentDate = currentyear.getTime();
 
 //        Calendar threemonth = Calendar.getInstance();
@@ -1607,13 +1555,13 @@ public class MonitorService {
             Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap2 = CacheContext.regionpointmap;
             Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap3 = CacheContext.grouppointmap;
 
-            if (pointwpmap.containsKey(wpId)){
+            if (pointwpmap.containsKey(wpId)) {
                 wtpointmap = pointwpmap.get(wpId);
-            }else if (pointwpmap1.containsKey(wpId)) {
+            } else if (pointwpmap1.containsKey(wpId)) {
                 wtpointmap = pointwpmap1.get(wpId);
-            }else if (pointwpmap2.containsKey(wpId)){
+            } else if (pointwpmap2.containsKey(wpId)) {
                 wtpointmap = pointwpmap2.get(wpId);
-            }else if (pointwpmap3.containsKey(wpId)){
+            } else if (pointwpmap3.containsKey(wpId)) {
                 wtpointmap = pointwpmap3.get(wpId);
             }
 
@@ -1678,7 +1626,7 @@ public class MonitorService {
 
                     PointData data = edosUtil.getSectionData(month, DateUtils.getEndOfDay(DateUtils.getMonthLast(date)).getTime());
                     PowercurveVo vo1 = new PowercurveVo();
-                    vo1.setYfdl(DoubleUtils.keepPrecision(data.getPointValueInDouble(), 2));
+                    vo1.setYfdl(DoubleUtils.keepPrecision(data.getPointValueInDouble() / zjrl, 2));
                     vo1.setHours(i);
                     vos.add(vo1);
                     date = DateUtils.addMonths(date, -1);
@@ -1722,13 +1670,13 @@ public class MonitorService {
             Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap2 = CacheContext.regionpointmap;
             Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap3 = CacheContext.grouppointmap;
 
-            if (pointwpmap.containsKey(wpId)){
+            if (pointwpmap.containsKey(wpId)) {
                 wtpointmap = pointwpmap.get(wpId);
-            }else if (pointwpmap1.containsKey(wpId)) {
+            } else if (pointwpmap1.containsKey(wpId)) {
                 wtpointmap = pointwpmap1.get(wpId);
-            }else if (pointwpmap2.containsKey(wpId)){
+            } else if (pointwpmap2.containsKey(wpId)) {
                 wtpointmap = pointwpmap2.get(wpId);
-            }else if (pointwpmap3.containsKey(wpId)){
+            } else if (pointwpmap3.containsKey(wpId)) {
                 wtpointmap = pointwpmap3.get(wpId);
             }
 
@@ -1865,7 +1813,7 @@ public class MonitorService {
                         byjhdlsum += currentjh.stream().mapToDouble(ProBasicProjectPlan::getGeneratingCapacity).sum(); //本月计划电量合
                         bysjdlsum += currentjh.stream().mapToDouble(ProBasicProjectPlan::getOutageHours).sum(); //本月实际电量合
                     }
-                    for (int i = dom; i>0;i--) {
+                    for (int i = dom; i > 0; i--) {
                         ProjectplanVo vo = new ProjectplanVo();
                         vo.setJhdl(StringUtils.round(byjhdlsum / 30, 2));
                         PointData data = edosUtil.getSectionData(rfdl, DateUtils.getEndOfDay(date).getTime());