首页代码提交

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/monitor/MonitorController.java

@@ -139,4 +139,25 @@ public class MonitorController {
 
     }
 
+    @GetMapping("/projectplan")
+    @ResponseBody
+    @ApiOperation(value = "首页计划电量", notes = "首页计划电量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult projectplan(String wpId) throws Exception {
+
+        Map<String, String> map = new HashMap<>();
+        if (!wpId.isEmpty()) {
+            map = monitorService.plan(wpId);
+        }
+        if (null != map) {
+            return AjaxResult.successData(200, map);
+        } else {
+            return AjaxResult.error(500, "操作失败");
+        }
+
+    }
+
+
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/init/CacheContext.java

@@ -86,6 +86,7 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicPowerstation>  wplsG = new ArrayList<>(); //光电集合
     public static List<ProBasicPowerstation>  zwpls = new ArrayList<>();
     public static List<ProBasicCompany>  cpls = new ArrayList<>();
+    public static List<ProBasicCompany>  cpls1 = new ArrayList<>();
     public static List<ProBasicRegion>  rgls = new ArrayList<>();
     public static List<ProBasicEnergyGroup>  gpls = new ArrayList<>();
     public static List<ProBasicPowerstationPoint> powerpointls = new ArrayList<>();
@@ -204,6 +205,8 @@ public class CacheContext implements CommandLineRunner {
         }
 
         cpls=proBasicCompanyService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+
+        cpls1=proBasicCompanyService.list().stream().filter(i->i.getSpare2().equals("1")).collect(Collectors.toList());
         if (!cpls.isEmpty())
         {
             for(ProBasicCompany sq:cpls)

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

@@ -230,84 +230,155 @@ public class MonitorService {
 
             Map<String, Double> mxztmap = new LinkedHashMap<>();
 
-            for (ProBasicPowerstation wp : wplist) {
+            if (wpId.endsWith(QS) || wpId.endsWith(FD) || wpId.endsWith(GF)){
 
                 List<String> fjztls = new ArrayList<>();
                 List<String> gfztls = new ArrayList<>();
 
-                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());//通讯中断台数
-
-                        List<PointData> fjztlist = edosUtil.getRealData(fjztls);
-
-                        fd_gztjnum += fjztlist.get(0).getPointValueInDouble();
-                        fd_gzcnslnum += fjztlist.get(1).getPointValueInDouble();
-                        fd_jxtjnum += fjztlist.get(2).getPointValueInDouble();
-                        fd_jxclslnum += fjztlist.get(3).getPointValueInDouble();
-                        fd_dfnum += fjztlist.get(4).getPointValueInDouble();
-                        fd_jclyxnum += fjztlist.get(5).getPointValueInDouble();
-                        fd_sdtjnum += fjztlist.get(6).getPointValueInDouble();
-                        fd_zcfdnum += fjztlist.get(7).getPointValueInDouble();
-                        fd_tjnum += fjztlist.get(8).getPointValueInDouble();
-                        fd_xdjclnum += fjztlist.get(9).getPointValueInDouble();
-                        fd_sldwnum += fjztlist.get(10).getPointValueInDouble();
-                        fd_slhjnum += fjztlist.get(11).getPointValueInDouble();
-                        fd_lxnum += fjztlist.get(12).getPointValueInDouble();
-                        fd_wznum += fjztlist.get(13).getPointValueInDouble();
-                    }
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.GZTSMX).getNemCode());    //故障台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JXTSMX).getNemCode());    //检修台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.DJTSMX).getNemCode());//待机台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SDTJTSMX).getNemCode());//手动停机台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.XNTSMX).getNemCode());//性能台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.XDTJTSMX).getNemCode());//限电停机台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.LXTSMX).getNemCode());//离线台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
+
+                List<PointData> fjztlist = edosUtil.getRealData(fjztls);
+
+                fd_gztjnum += fjztlist.get(0).getPointValueInDouble();
+                fd_gzcnslnum += fjztlist.get(1).getPointValueInDouble();
+                fd_jxtjnum += fjztlist.get(2).getPointValueInDouble();
+                fd_jxclslnum += fjztlist.get(3).getPointValueInDouble();
+                fd_dfnum += fjztlist.get(4).getPointValueInDouble();
+                fd_jclyxnum += fjztlist.get(5).getPointValueInDouble();
+                fd_sdtjnum += fjztlist.get(6).getPointValueInDouble();
+                fd_zcfdnum += fjztlist.get(7).getPointValueInDouble();
+                fd_tjnum += fjztlist.get(8).getPointValueInDouble();
+                fd_xdjclnum += fjztlist.get(9).getPointValueInDouble();
+                fd_sldwnum += fjztlist.get(10).getPointValueInDouble();
+                fd_slhjnum += fjztlist.get(11).getPointValueInDouble();
+                fd_lxnum += fjztlist.get(12).getPointValueInDouble();
+                fd_wznum += fjztlist.get(13).getPointValueInDouble();
+
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.GZTSMX).getNemCode());    //故障台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JXTSMX).getNemCode());    //检修台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.DJTSMX).getNemCode());//待机台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SDTJTSMX).getNemCode());//手动停机台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.XNTSMX).getNemCode());//性能台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.XDTJTSMX).getNemCode());//限电停机台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.LXTSMX).getNemCode());//离线台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
+
+                List<PointData> gfztlist = edosUtil.getRealData(gfztls);
+
+                gf_gztjnum += gfztlist.get(0).getPointValueInDouble();
+                gf_gzcnslnum += gfztlist.get(1).getPointValueInDouble();
+                gf_jxtjnum += gfztlist.get(2).getPointValueInDouble();
+                gf_jxclslnum += gfztlist.get(3).getPointValueInDouble();
+                gf_dfnum += gfztlist.get(4).getPointValueInDouble();
+                gf_jclyxnum += gfztlist.get(5).getPointValueInDouble();
+                gf_sdtjnum += gfztlist.get(6).getPointValueInDouble();
+                gf_zcfdnum += gfztlist.get(7).getPointValueInDouble();
+                gf_tjnum += gfztlist.get(8).getPointValueInDouble();
+                gf_xdjclnum += gfztlist.get(9).getPointValueInDouble();
+                gf_sldwnum += gfztlist.get(10).getPointValueInDouble();
+                gf_slhjnum += gfztlist.get(11).getPointValueInDouble();
+                gf_lxnum += gfztlist.get(12).getPointValueInDouble();
+                gf_wznum += gfztlist.get(13).getPointValueInDouble();
+
+            } else {
+                for (ProBasicPowerstation wp : wplist) {
+
+                    List<String> fjztls = new ArrayList<>();
+                    List<String> gfztls = new ArrayList<>();
+
+                    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());//通讯中断台数
+
+                            List<PointData> fjztlist = edosUtil.getRealData(fjztls);
+
+                            fd_gztjnum += fjztlist.get(0).getPointValueInDouble();
+                            fd_gzcnslnum += fjztlist.get(1).getPointValueInDouble();
+                            fd_jxtjnum += fjztlist.get(2).getPointValueInDouble();
+                            fd_jxclslnum += fjztlist.get(3).getPointValueInDouble();
+                            fd_dfnum += fjztlist.get(4).getPointValueInDouble();
+                            fd_jclyxnum += fjztlist.get(5).getPointValueInDouble();
+                            fd_sdtjnum += fjztlist.get(6).getPointValueInDouble();
+                            fd_zcfdnum += fjztlist.get(7).getPointValueInDouble();
+                            fd_tjnum += fjztlist.get(8).getPointValueInDouble();
+                            fd_xdjclnum += fjztlist.get(9).getPointValueInDouble();
+                            fd_sldwnum += fjztlist.get(10).getPointValueInDouble();
+                            fd_slhjnum += fjztlist.get(11).getPointValueInDouble();
+                            fd_lxnum += fjztlist.get(12).getPointValueInDouble();
+                            fd_wznum += fjztlist.get(13).getPointValueInDouble();
+                        }
 
-                } 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());//通讯中断台数
-
-                        List<PointData> gfztlist = edosUtil.getRealData(gfztls);
-
-                        gf_gztjnum += gfztlist.get(0).getPointValueInDouble();
-                        gf_gzcnslnum += gfztlist.get(1).getPointValueInDouble();
-                        gf_jxtjnum += gfztlist.get(2).getPointValueInDouble();
-                        gf_jxclslnum += gfztlist.get(3).getPointValueInDouble();
-                        gf_dfnum += gfztlist.get(4).getPointValueInDouble();
-                        gf_jclyxnum += gfztlist.get(5).getPointValueInDouble();
-                        gf_sdtjnum += gfztlist.get(6).getPointValueInDouble();
-                        gf_zcfdnum += gfztlist.get(7).getPointValueInDouble();
-                        gf_tjnum += gfztlist.get(8).getPointValueInDouble();
-                        gf_xdjclnum += gfztlist.get(9).getPointValueInDouble();
-                        gf_sldwnum += gfztlist.get(10).getPointValueInDouble();
-                        gf_slhjnum += gfztlist.get(11).getPointValueInDouble();
-                        gf_lxnum += gfztlist.get(12).getPointValueInDouble();
-                        gf_wznum += gfztlist.get(13).getPointValueInDouble();
+                    } 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());//通讯中断台数
+
+                            List<PointData> gfztlist = edosUtil.getRealData(gfztls);
+
+                            gf_gztjnum += gfztlist.get(0).getPointValueInDouble();
+                            gf_gzcnslnum += gfztlist.get(1).getPointValueInDouble();
+                            gf_jxtjnum += gfztlist.get(2).getPointValueInDouble();
+                            gf_jxclslnum += gfztlist.get(3).getPointValueInDouble();
+                            gf_dfnum += gfztlist.get(4).getPointValueInDouble();
+                            gf_jclyxnum += gfztlist.get(5).getPointValueInDouble();
+                            gf_sdtjnum += gfztlist.get(6).getPointValueInDouble();
+                            gf_zcfdnum += gfztlist.get(7).getPointValueInDouble();
+                            gf_tjnum += gfztlist.get(8).getPointValueInDouble();
+                            gf_xdjclnum += gfztlist.get(9).getPointValueInDouble();
+                            gf_sldwnum += gfztlist.get(10).getPointValueInDouble();
+                            gf_slhjnum += gfztlist.get(11).getPointValueInDouble();
+                            gf_lxnum += gfztlist.get(12).getPointValueInDouble();
+                            gf_wznum += gfztlist.get(13).getPointValueInDouble();
+                        }
                     }
                 }
-
+            }
                 mxztmap.put("fd_dfnum", fd_dfnum);
                 mxztmap.put("fd_sdtjnum", fd_sdtjnum);
                 mxztmap.put("fd_zcfdnum", fd_zcfdnum);
@@ -505,7 +576,7 @@ public class MonitorService {
 //                    mxztmap.put("gf_lxyznum", gf_wznum + gf_lxnum);
 //                }
 
-            }
+
             map.put("mxztmap", mxztmap);
 
 
@@ -613,17 +684,26 @@ public class MonitorService {
                 ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
                 jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
 
+                if (wpId.contains(QS)){
+
+                    String str = wpId;
+                    //实时功率
+                    ProBasicPowerstationPoint fdsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0,str.indexOf("0")) + "-1", ContantXk.SSZGL);
+                    fdsjgl = edosUtil.getRealData(fdsjglvalue).getPointValueInDouble();
+                    ProBasicPowerstationPoint gfsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0,str.indexOf("0")) + "-2", ContantXk.SSZGL);
+                    gfsjgl = edosUtil.getRealData(gfsjglvalue).getPointValueInDouble();
+                }
 
                 for (ProBasicPowerstation wp : wplist) {
-                    if (wp.getSpare4().equals("1")) {
-                        //实时功率
-                        ProBasicPowerstationPoint fdglvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZGL);
-                        fdsjgl += edosUtil.getRealData(fdglvalue).getPointValueInDouble();
-                    } else {
-                        //实时功率
-                        ProBasicPowerstationPoint gfglvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZGL);
-                        gfsjgl += edosUtil.getRealData(gfglvalue).getPointValueInDouble();
-                    }
+//                    if (wp.getSpare4().equals("1")) {
+//                        //实时功率
+//                        ProBasicPowerstationPoint fdglvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.SSZGL);
+//                        fdsjgl += edosUtil.getRealData(fdglvalue).getPointValueInDouble();
+//                    } else {
+//                        //实时功率
+//                        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();
@@ -741,120 +821,120 @@ public class MonitorService {
 
 
             /**********************************************首页电量统计**********************************************************/
-            Calendar cal = Calendar.getInstance();
-            cal.setTime(new Date());
-            int year = cal.get(Calendar.YEAR);
-
-            double fd_r_jhdl = 0;
-            double fd_y_jhdl = 0;
-            double fd_n_jhdl = 0;
-            double gf_r_jhdl = 0;
-            double gf_y_jhdl = 0;
-            double gf_n_jhdl = 0;
-
-            double fd_r_sjdl = 0;
-            double fd_y_sjdl = 0;
-            double fd_n_sjdl = 0;
-            double gf_r_sjdl = 0;
-            double gf_y_sjdl = 0;
-            double gf_n_sjdl = 0;
-
-
-            List<ProBasicProjectPlan> pjls = proBasicProjectPlanService.getList(String.valueOf(year));
-
-            // 获取计划发电量信息
-            Map<String, Map<String, Double>> planmap = new HashMap<>();
-
-            setPlanInfoByType(planmap, pjls, wpId);
-
-            for (ProBasicPowerstation wp : wplist) {
-                if (planmap.containsKey(wp.getId())) {
-                    Map<String, Double> valuemap = planmap.get(wp.getId());
-
-                    double yfdljh = 0.0;
-                    double rfdlsj = 0.0;
-                    double yfdlsj = 0.0;
-                    double nfdljh = 0.0;
-                    double nfdlsj = 0.0;
-                    if (valuemap.containsKey("yfdljh")) {
-                        yfdljh = valuemap.get("yfdljh");
-                    }
-//                    if (valuemap.containsKey("yfdlsj")) {
-//                        yfdlsj = valuemap.get("yfdlsj");
+//            Calendar cal = Calendar.getInstance();
+//            cal.setTime(new Date());
+//            int year = cal.get(Calendar.YEAR);
+//
+//            double fd_r_jhdl = 0;
+//            double fd_y_jhdl = 0;
+//            double fd_n_jhdl = 0;
+//            double gf_r_jhdl = 0;
+//            double gf_y_jhdl = 0;
+//            double gf_n_jhdl = 0;
+//
+//            double fd_r_sjdl = 0;
+//            double fd_y_sjdl = 0;
+//            double fd_n_sjdl = 0;
+//            double gf_r_sjdl = 0;
+//            double gf_y_sjdl = 0;
+//            double gf_n_sjdl = 0;
+//
+//
+//            List<ProBasicProjectPlan> pjls = proBasicProjectPlanService.getList(String.valueOf(year));
+//
+//            // 获取计划发电量信息
+//            Map<String, Map<String, Double>> planmap = new HashMap<>();
+//
+//            setPlanInfoByType(planmap, pjls, wpId);
+//
+//            for (ProBasicPowerstation wp : wplist) {
+//                if (planmap.containsKey(wp.getId())) {
+//                    Map<String, Double> valuemap = planmap.get(wp.getId());
+//
+//                    double yfdljh = 0.0;
+//                    double rfdlsj = 0.0;
+//                    double yfdlsj = 0.0;
+//                    double nfdljh = 0.0;
+//                    double nfdlsj = 0.0;
+//                    if (valuemap.containsKey("yfdljh")) {
+//                        yfdljh = valuemap.get("yfdljh");
 //                    }
-                    if (valuemap.containsKey("nfdljh")) {
-                        nfdljh = valuemap.get("nfdljh");
-                    }
-//                    if (valuemap.containsKey("nfdlsj")) {
-//                        nfdlsj = valuemap.get("nfdlsj");
+////                    if (valuemap.containsKey("yfdlsj")) {
+////                        yfdlsj = valuemap.get("yfdlsj");
+////                    }
+//                    if (valuemap.containsKey("nfdljh")) {
+//                        nfdljh = valuemap.get("nfdljh");
 //                    }
-                    if (wp.getId().indexOf("FDC_STA") >= 0) {
-                        //日发电量
-                        ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
-                        rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
-                        //月发电量
-                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
-                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
-                        //年发电量
-                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
-                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
-
-                        fd_r_jhdl = fd_r_jhdl + yfdljh / 30;
-                        fd_y_jhdl = fd_y_jhdl + yfdljh;
-                        fd_n_jhdl = fd_n_jhdl + nfdljh;
-
-                        fd_r_sjdl = fd_r_sjdl + rfdlsj;
-                        fd_y_sjdl = fd_y_sjdl + yfdlsj;
-                        fd_n_sjdl = fd_n_sjdl + nfdlsj;
-                    } else {
-                        //日发电量
-                        ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
-                        rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
-                        //月发电量
-                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
-                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
-
-                        //年发电量
-                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
-                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
-
-                        gf_r_jhdl = gf_r_jhdl + yfdljh / 30;
-                        gf_y_jhdl = gf_y_jhdl + yfdljh;
-                        gf_n_jhdl = gf_n_jhdl + nfdljh;
-
-                        gf_r_sjdl = gf_r_sjdl + rfdlsj;
-                        gf_y_sjdl = gf_y_sjdl + yfdlsj;
-                        gf_n_sjdl = gf_n_sjdl + rfdlsj;
-                    }
-                }
-
-            }
-
-
-            Map<String, Double> proplanmap = new HashMap<>();
-
-            proplanmap.put("fd_r_jhdl", StringUtils.round(fd_r_jhdl, 0));
-            proplanmap.put("fd_y_jhdl", StringUtils.round(fd_y_jhdl, 0));
-            proplanmap.put("fd_n_jhdl", StringUtils.round(fd_n_jhdl, 0));
-            proplanmap.put("fd_r_sjdl", StringUtils.round(fd_r_sjdl, 2));
-            proplanmap.put("fd_y_sjdl", StringUtils.round(fd_y_sjdl, 2));
-            proplanmap.put("fd_n_sjdl", StringUtils.round(fd_n_sjdl, 2));
-
-            proplanmap.put("gf_r_jhdl", StringUtils.round(gf_r_jhdl, 0));
-            proplanmap.put("gf_y_jhdl", StringUtils.round(gf_y_jhdl, 0));
-            proplanmap.put("gf_n_jhdl", StringUtils.round(gf_n_jhdl, 0));
-            proplanmap.put("gf_r_sjdl", StringUtils.round(gf_r_sjdl, 2));
-            proplanmap.put("gf_y_sjdl", StringUtils.round(gf_y_sjdl, 2));
-            proplanmap.put("gf_n_sjdl", StringUtils.round(gf_n_sjdl, 2));
-
-            proplanmap.put("qy_r_jhdl", StringUtils.round(fd_r_jhdl + gf_r_jhdl, 0));
-            proplanmap.put("qy_y_jhdl", StringUtils.round(fd_y_jhdl + gf_y_jhdl, 0));
-            proplanmap.put("qy_n_jhdl", StringUtils.round(fd_n_jhdl + gf_n_jhdl, 0));
-            proplanmap.put("qy_r_sjdl", StringUtils.round(fd_r_sjdl + gf_r_sjdl, 2));
-            proplanmap.put("qy_y_sjdl", StringUtils.round(fd_y_sjdl + gf_y_sjdl, 2));
-            proplanmap.put("qy_n_sjdl", StringUtils.round(fd_n_sjdl + gf_n_sjdl, 2));
-
-            map.put("proplanmap", proplanmap);
+////                    if (valuemap.containsKey("nfdlsj")) {
+////                        nfdlsj = valuemap.get("nfdlsj");
+////                    }
+//                    if (wp.getId().indexOf("FDC_STA") >= 0) {
+//                        //日发电量
+//                        ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
+//                        rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+//                        //月发电量
+//                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
+//                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+//                        //年发电量
+//                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
+//                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+//
+//                        fd_r_jhdl = fd_r_jhdl + yfdljh / 30;
+//                        fd_y_jhdl = fd_y_jhdl + yfdljh;
+//                        fd_n_jhdl = fd_n_jhdl + nfdljh;
+//
+//                        fd_r_sjdl = fd_r_sjdl + rfdlsj;
+//                        fd_y_sjdl = fd_y_sjdl + yfdlsj;
+//                        fd_n_sjdl = fd_n_sjdl + nfdlsj;
+//                    } else {
+//                        //日发电量
+//                        ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
+//                        rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+//                        //月发电量
+//                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
+//                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+//
+//                        //年发电量
+//                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
+//                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+//
+//                        gf_r_jhdl = gf_r_jhdl + yfdljh / 30;
+//                        gf_y_jhdl = gf_y_jhdl + yfdljh;
+//                        gf_n_jhdl = gf_n_jhdl + nfdljh;
+//
+//                        gf_r_sjdl = gf_r_sjdl + rfdlsj;
+//                        gf_y_sjdl = gf_y_sjdl + yfdlsj;
+//                        gf_n_sjdl = gf_n_sjdl + rfdlsj;
+//                    }
+//                }
+//
+//            }
+//
+//
+//            Map<String, Double> proplanmap = new HashMap<>();
+//
+//            proplanmap.put("fd_r_jhdl", StringUtils.round(fd_r_jhdl, 0));
+//            proplanmap.put("fd_y_jhdl", StringUtils.round(fd_y_jhdl, 0));
+//            proplanmap.put("fd_n_jhdl", StringUtils.round(fd_n_jhdl, 0));
+//            proplanmap.put("fd_r_sjdl", StringUtils.round(fd_r_sjdl, 2));
+//            proplanmap.put("fd_y_sjdl", StringUtils.round(fd_y_sjdl, 2));
+//            proplanmap.put("fd_n_sjdl", StringUtils.round(fd_n_sjdl, 2));
+//
+//            proplanmap.put("gf_r_jhdl", StringUtils.round(gf_r_jhdl, 0));
+//            proplanmap.put("gf_y_jhdl", StringUtils.round(gf_y_jhdl, 0));
+//            proplanmap.put("gf_n_jhdl", StringUtils.round(gf_n_jhdl, 0));
+//            proplanmap.put("gf_r_sjdl", StringUtils.round(gf_r_sjdl, 2));
+//            proplanmap.put("gf_y_sjdl", StringUtils.round(gf_y_sjdl, 2));
+//            proplanmap.put("gf_n_sjdl", StringUtils.round(gf_n_sjdl, 2));
+//
+//            proplanmap.put("qy_r_jhdl", StringUtils.round(fd_r_jhdl + gf_r_jhdl, 0));
+//            proplanmap.put("qy_y_jhdl", StringUtils.round(fd_y_jhdl + gf_y_jhdl, 0));
+//            proplanmap.put("qy_n_jhdl", StringUtils.round(fd_n_jhdl + gf_n_jhdl, 0));
+//            proplanmap.put("qy_r_sjdl", StringUtils.round(fd_r_sjdl + gf_r_sjdl, 2));
+//            proplanmap.put("qy_y_sjdl", StringUtils.round(fd_y_sjdl + gf_y_sjdl, 2));
+//            proplanmap.put("qy_n_sjdl", StringUtils.round(fd_n_sjdl + gf_n_sjdl, 2));
+//
+//            map.put("proplanmap", proplanmap);
             /**********************************************首页电量统计**********************************************************/
 
 
@@ -1090,7 +1170,7 @@ public class MonitorService {
             double qhfdfj_ts = 0;
             double jr_qhfdfj_ts = 0;
 
-            List<ProBasicCompany> cplist = CacheContext.cpls;
+            List<ProBasicCompany> cplist = CacheContext.cpls1;
 
             Map<String, Double> cblpoint = new LinkedHashMap<>();
 
@@ -1106,7 +1186,7 @@ public class MonitorService {
                         //清洁能源光伏装机容量
                         qjny_gf_zjrl += null != pg.getCapacity() ? pg.getCapacity() : 0.0;
                         //接入风电装机容量
-                        jr_fd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        jr_fd_zjrl += null != pg.getJrwindCapacity() ? pg.getJrwindCapacity() : 0.0;
                         //接入光伏装机容量
                         jr_gf_zjrl += null != pg.getJrCapacity() ? pg.getJrCapacity() : 0.0;
                         //清洁能源风场数量
@@ -1130,100 +1210,120 @@ public class MonitorService {
                         //接入光伏集中数量
                         jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 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;
+                        //清洁能源风电装机容量
+                        qjny_fd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        //清洁能源光伏装机容量
+                        qjny_gf_zjrl += null != pg.getCapacity() ? pg.getCapacity() : 0.0;
                         //接入风电装机容量
-                        jr_flfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
-                        //风场数量
-                        flfd_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
+                        jr_fd_zjrl += null != pg.getJrwindCapacity() ? pg.getJrwindCapacity() : 0.0;
+                        //接入光伏装机容量
+                        jr_gf_zjrl += null != pg.getJrCapacity() ? pg.getJrCapacity() : 0.0;
+                        //清洁能源风场数量
+                        qjny_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
+                        //清洁能源光伏电站数量
+                        qjny_gfts += null != pg.getNumber() ? pg.getNumber() : 0.0;
                         //接入风场数量
-                        jr_flfdfcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
-                        //风机数量
-                        flfdfj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
+                        jr_fcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
+                        //接入光伏电站数量
+                        jr_gfts += null != pg.getJrNumber() ? pg.getJrNumber() : 0.0;
+                        //清洁能源风机数量
+                        qjny_fj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
+                        //清洁能源光伏组串数量
+                        qjny_gf_zcts += null != pg.getQuantityZc() ? pg.getQuantityZc() : 0.0;
+                        //清洁能源光伏集中数量
+                        qjny_gf_jzts += null != pg.getQuantityJz() ? pg.getQuantityJz() : 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));
+                        jr_fj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
+                        //接入光伏组串数量
+                        jr_gf_zcts += null != pg.getJrquantityZc() ? pg.getJrquantityZc() : 0.0;
+                        //接入光伏集中数量
+                        jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
 
                     } else if (wpId.contains(pg.getId()) && pg.getOrderNum().equals(3)) {   //光伏公司
+
+                        //清洁能源风电装机容量
+                        qjny_fd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
                         //清洁能源光伏装机容量
-                        gffd_zjrl += null != pg.getCapacity() ? pg.getCapacity() : 0.0;
+                        qjny_gf_zjrl += null != pg.getCapacity() ? pg.getCapacity() : 0.0;
+                        //接入风电装机容量
+                        jr_fd_zjrl += null != pg.getJrwindCapacity() ? pg.getJrwindCapacity() : 0.0;
                         //接入光伏装机容量
-                        jr_gffd_zjrl += null != pg.getJrCapacity() ? pg.getJrCapacity() : 0.0;
+                        jr_gf_zjrl += null != pg.getJrCapacity() ? pg.getJrCapacity() : 0.0;
+                        //清洁能源风场数量
+                        qjny_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
                         //清洁能源光伏电站数量
-                        gffdts += null != pg.getNumber() ? pg.getNumber() : 0.0;
+                        qjny_gfts += null != pg.getNumber() ? pg.getNumber() : 0.0;
+                        //接入风场数量
+                        jr_fcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
                         //接入光伏电站数量
-                        jr_gffdts += null != pg.getJrNumber() ? pg.getJrNumber() : 0.0;
+                        jr_gfts += null != pg.getJrNumber() ? pg.getJrNumber() : 0.0;
+                        //清洁能源风机数量
+                        qjny_fj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
                         //清洁能源光伏组串数量
-                        gffd_zcts += null != pg.getQuantityZc() ? pg.getQuantityZc() : 0.0;
+                        qjny_gf_zcts += null != pg.getQuantityZc() ? pg.getQuantityZc() : 0.0;
                         //清洁能源光伏集中数量
-                        gffd_jzts += null != pg.getQuantityJz() ? pg.getQuantityJz() : 0.0;
+                        qjny_gf_jzts += null != pg.getQuantityJz() ? pg.getQuantityJz() : 0.0;
+                        //接入风机数量
+                        jr_fj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
                         //接入光伏组串数量
-                        jr_gffd_zcts += null != pg.getJrquantityZc() ? pg.getJrquantityZc() : 0.0;
+                        jr_gf_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));
+                        jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
 
                     } 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));
+                        //清洁能源风电装机容量
+                        qjny_fd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        //清洁能源光伏装机容量
+                        qjny_gf_zjrl += null != pg.getCapacity() ? pg.getCapacity() : 0.0;
+                        //接入风电装机容量
+                        jr_fd_zjrl += null != pg.getJrwindCapacity() ? pg.getJrwindCapacity() : 0.0;
+                        //接入光伏装机容量
+                        jr_gf_zjrl += null != pg.getJrCapacity() ? pg.getJrCapacity() : 0.0;
+                        //清洁能源风场数量
+                        qjny_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
+                        //清洁能源光伏电站数量
+                        qjny_gfts += null != pg.getNumber() ? pg.getNumber() : 0.0;
+                        //接入风场数量
+                        jr_fcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
+                        //接入光伏电站数量
+                        jr_gfts += null != pg.getJrNumber() ? pg.getJrNumber() : 0.0;
+                        //清洁能源风机数量
+                        qjny_fj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
+                        //清洁能源光伏组串数量
+                        qjny_gf_zcts += null != pg.getQuantityZc() ? pg.getQuantityZc() : 0.0;
+                        //清洁能源光伏集中数量
+                        qjny_gf_jzts += null != pg.getQuantityJz() ? pg.getQuantityJz() : 0.0;
+                        //接入风机数量
+                        jr_fj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
+                        //接入光伏组串数量
+                        jr_gf_zcts += null != pg.getJrquantityZc() ? pg.getJrquantityZc() : 0.0;
+                        //接入光伏集中数量
+                        jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 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));
+
+
             }
             if (wpId.contains("SXJ_RGN")) {
 
@@ -1238,7 +1338,7 @@ public class MonitorService {
                         //清洁能源光伏装机容量
                         qjny_gf_zjrl += null != pg1.getCapacity() ? pg1.getCapacity() : 0.0;
                         //接入风电装机容量
-                        jr_fd_zjrl += null != pg1.getWindCapacity() ? pg1.getWindCapacity() : 0.0;
+                        jr_fd_zjrl += null != pg1.getJrwindCapacity() ? pg1.getJrwindCapacity() : 0.0;
                         //接入光伏装机容量
                         jr_gf_zjrl += null != pg1.getJrCapacity() ? pg1.getJrCapacity() : 0.0;
                         //清洁能源风场数量
@@ -1290,7 +1390,7 @@ public class MonitorService {
                     qjny_fd_zjrl += null != wp.getWindCapacity() ? wp.getWindCapacity() : 0.0;
 
                     //接入风电装机容量
-                    jr_fd_zjrl += null != wp.getWindCapacity() ? wp.getWindCapacity() : 0.0;
+                    jr_fd_zjrl += null != wp.getJrwindCapacity() ? wp.getJrwindCapacity() : 0.0;
 
                     //清洁能源风机数量
                     qjny_fj_ts += null != wp.getWindQuantityLd() ? wp.getWindQuantityLd() : 0.0;
@@ -1395,8 +1495,9 @@ public class MonitorService {
         Date endDate = com.gyee.common.util.DateUtils.getCurrentDate();   //当前时间
         List<PowercurveVo> vos = new ArrayList<PowercurveVo>();
 
+        int day = DateUtils.getCurrentHour();//4
 
-        for (int i = 0; i < 24; i++) {
+        for (int i = 0; i < day; i++) {
             PowercurveVo vo = new PowercurveVo();
             vo.setLlgl(0.0); //理论功率
             vo.setBzgl(0.0); //保证功率
@@ -1834,7 +1935,171 @@ public class MonitorService {
 
     }
 
+    public Map plan(String wpId) throws Exception {
+
+        Map<String, Object> map = new HashMap<>();
+
+        if (wpId.endsWith(QS) || wpId.endsWith(FD) || wpId.endsWith(GF) || CacheContext.wpmapls.containsKey(wpId)) {
+
+            List<ProBasicPowerstation> wplist = new ArrayList<>();
+            if (CacheContext.wpmapls.containsKey(wpId)) {
+                wplist = CacheContext.wpmapls.get(wpId);
+            }
+            for (ProBasicPowerstation wp : CacheContext.wpls) {
+                if (wpId.contains(FD)) {
+                    if (wp.getId().endsWith("FDC_STA")) {
+                        wplist.add(wp);
+                    }
+                } else if (wpId.contains(GF)) {
+                    if (wp.getId().endsWith("GDC_STA")) {
+                        wplist.add(wp);
+                    }
+                } else if (wpId.contains(QS)) {
+                    wplist.add(wp);
+                }
+            }
+            List<ProBasicPowerstation> rglist = new ArrayList<>();
+            List<ProBasicRegion> rgls = CacheContext.rgls;
+
+            for (ProBasicPowerstation wp1 : CacheContext.wpls) {
+                for (ProBasicRegion rg : rgls) {
+                    if (wpId.contains(rg.getId()) && wpId.contains(wp1.getRegionId())) {
+                        rglist.add(wp1);
+                        wplist = rglist;
+                    }
+                }
+            }
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(new Date());
+            int year = cal.get(Calendar.YEAR);
+
+            double fd_r_jhdl = 0;
+            double fd_y_jhdl = 0;
+            double fd_n_jhdl = 0;
+            double gf_r_jhdl = 0;
+            double gf_y_jhdl = 0;
+            double gf_n_jhdl = 0;
+
+            double fd_r_sjdl = 0;
+            double fd_y_sjdl = 0;
+            double fd_n_sjdl = 0;
+            double gf_r_sjdl = 0;
+            double gf_y_sjdl = 0;
+            double gf_n_sjdl = 0;
+
+
+            List<ProBasicProjectPlan> pjls = proBasicProjectPlanService.getList(String.valueOf(year));
 
+            // 获取计划发电量信息
+            Map<String, Map<String, Double>> planmap = new HashMap<>();
+
+            setPlanInfoByType(planmap, pjls, wpId);
+
+            for (ProBasicPowerstation wp : wplist) {
+
+                if (planmap.containsKey(wp.getId())) {
+                    Map<String, Double> valuemap = planmap.get(wp.getId());
+
+                    double yfdljh = 0.0;
+                    double rfdlsj = 0.0;
+                    double yfdlsj = 0.0;
+                    double nfdljh = 0.0;
+                    double nfdlsj = 0.0;
+                    if (valuemap.containsKey("yfdljh")) {
+                        yfdljh = valuemap.get("yfdljh");
+                    }
+                    if (valuemap.containsKey("nfdljh")) {
+                        nfdljh = valuemap.get("nfdljh");
+                    }
+                    if (wp.getId().indexOf("FDC_STA") >= 0) {
+                        //日发电量
+                        ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
+                        rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+                        //月发电量
+                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
+                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+                        //年发电量
+                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
+                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+
+                        fd_r_jhdl = fd_r_jhdl + yfdljh / 30;
+                        fd_y_jhdl = fd_y_jhdl + yfdljh;
+                        fd_n_jhdl = fd_n_jhdl + nfdljh;
+
+                        fd_r_sjdl = fd_r_sjdl + rfdlsj;
+                        fd_y_sjdl = fd_y_sjdl + yfdlsj;
+                        fd_n_sjdl = fd_n_sjdl + nfdlsj;
+                    } else {
+                        //日发电量
+                        ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
+                        rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+                        //月发电量
+                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
+                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+
+                        //年发电量
+                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
+                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+
+                        gf_r_jhdl = gf_r_jhdl + yfdljh / 30;
+                        gf_y_jhdl = gf_y_jhdl + yfdljh;
+                        gf_n_jhdl = gf_n_jhdl + nfdljh;
+
+                        gf_r_sjdl = gf_r_sjdl + rfdlsj;
+                        gf_y_sjdl = gf_y_sjdl + yfdlsj;
+                        gf_n_sjdl = gf_n_sjdl + nfdlsj;
+                    }
+
+
+
+                }
+
+            }
+
+        if (wpId.contains("FL")) {
+            gf_r_jhdl = 0;
+            gf_y_jhdl = 0;
+            gf_n_jhdl = 0;
+            gf_r_sjdl =0;
+            gf_y_sjdl =0;
+            gf_n_sjdl =0;
+        }else if (wpId.contains("GF")){
+            fd_r_jhdl = 0;
+            fd_y_jhdl = 0;
+            fd_n_jhdl = 0;
+            fd_r_sjdl =0;
+            fd_y_sjdl =0;
+            fd_n_sjdl =0;
+        }
+
+            Map<String, Double> proplanmap = new HashMap<>();
+
+            proplanmap.put("fd_r_jhdl", StringUtils.round(fd_r_jhdl, 0));
+            proplanmap.put("fd_y_jhdl", StringUtils.round(fd_y_jhdl, 0));
+            proplanmap.put("fd_n_jhdl", StringUtils.round(fd_n_jhdl, 0));
+            proplanmap.put("fd_r_sjdl", StringUtils.round(fd_r_sjdl, 2));
+            proplanmap.put("fd_y_sjdl", StringUtils.round(fd_y_sjdl, 2));
+            proplanmap.put("fd_n_sjdl", StringUtils.round(fd_n_sjdl, 2));
+
+            proplanmap.put("gf_r_jhdl", StringUtils.round(gf_r_jhdl, 0));
+            proplanmap.put("gf_y_jhdl", StringUtils.round(gf_y_jhdl, 0));
+            proplanmap.put("gf_n_jhdl", StringUtils.round(gf_n_jhdl, 0));
+
+            proplanmap.put("gf_r_sjdl", StringUtils.round(gf_r_sjdl, 2));
+            proplanmap.put("gf_y_sjdl", StringUtils.round(gf_y_sjdl, 2));
+            proplanmap.put("gf_n_sjdl", StringUtils.round(gf_n_sjdl, 2));
+
+            proplanmap.put("qy_r_jhdl", StringUtils.round(fd_r_jhdl + gf_r_jhdl, 0));
+            proplanmap.put("qy_y_jhdl", StringUtils.round(fd_y_jhdl + gf_y_jhdl, 0));
+            proplanmap.put("qy_n_jhdl", StringUtils.round(fd_n_jhdl + gf_n_jhdl, 0));
+            proplanmap.put("qy_r_sjdl", StringUtils.round(fd_r_sjdl + gf_r_sjdl, 2));
+            proplanmap.put("qy_y_sjdl", StringUtils.round(fd_y_sjdl + gf_y_sjdl, 2));
+            proplanmap.put("qy_n_sjdl", StringUtils.round(fd_n_sjdl + gf_n_sjdl, 2));
+
+            map.put("proplanmap", proplanmap);
+        }
+        return map;
+    }
     /**********************************************计划电量统计**********************************************************/
     private void setPlanInfoByType
     (Map<String, Map<String, Double>> gxkmap, List<ProBasicProjectPlan> planls, String wpId) {