首页部分数据计算修改

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

@@ -233,27 +233,27 @@ public class MonitorService {
                 List<String> fjztls = new ArrayList<>();
                 List<String> gfztls = new ArrayList<>();
 
-                String str1 =null;
+                String str1 = null;
                 if (wpId.endsWith(QS)) {
                     String str = wpId;
-                   str1 = str.substring(0, str.indexOf("0")) + "-1";
-                }else {
+                    str1 = str.substring(0, str.indexOf("0")) + "-1";
+                } else {
                     str1 = wpId;
                 }
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.GZTSMX).getNemCode());    //故障台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.JXTSMX).getNemCode());    //检修台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.DJTSMX).getNemCode());//待机台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.SDTJTSMX).getNemCode());//手动停机台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.XNTSMX).getNemCode());//性能台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.XDTJTSMX).getNemCode());//限电停机台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.LXTSMX).getNemCode());//离线台数
-                    fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.GZTSMX).getNemCode());    //故障台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.JXTSMX).getNemCode());    //检修台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.DJTSMX).getNemCode());//待机台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.SDTJTSMX).getNemCode());//手动停机台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.XNTSMX).getNemCode());//性能台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.XDTJTSMX).getNemCode());//限电停机台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.LXTSMX).getNemCode());//离线台数
+                fjztls.add(proBasicPowerstationPointService.getPowerstationPoint(str1, ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
 
                 List<PointData> fjztlist = edosUtil.getRealData(fjztls);
 
@@ -271,27 +271,27 @@ public class MonitorService {
                 fd_slhjnum += fjztlist.get(11).getPointValueInDouble();
                 fd_lxnum += fjztlist.get(12).getPointValueInDouble();
                 fd_wznum += fjztlist.get(13).getPointValueInDouble();
-                String str2 =null;
+                String str2 = null;
                 if (wpId.endsWith(QS)) {
                     String str = wpId;
                     str2 = str.substring(0, str.indexOf("0")) + "-2";
-                }else {
+                } else {
                     str2 = wpId;
                 }
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.GZTSMX).getNemCode());    //故障台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.JXTSMX).getNemCode());    //检修台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.DJTSMX).getNemCode());//待机台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.SDTJTSMX).getNemCode());//手动停机台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.XNTSMX).getNemCode());//性能台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.XDTJTSMX).getNemCode());//限电停机台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.LXTSMX).getNemCode());//离线台数
-                    gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.GZTSMX).getNemCode());    //故障台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.CNSLGZTSMX).getNemCode()); //场内受累故障台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.JXTSMX).getNemCode());    //检修台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.CNSLJXTSMX).getNemCode());//场内受累检修台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.DJTSMX).getNemCode());//待机台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.QXJCLTSMX).getNemCode());//缺陷降出力台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.SDTJTSMX).getNemCode());//手动停机台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.XNTSMX).getNemCode());//性能台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.XDTJTSMX).getNemCode());//限电停机台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.XDJCLTSMX).getNemCode());//限电降出力台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.CWSLDWTSMX).getNemCode());//场外受累电网台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.CWSLTQTSMX).getNemCode());//场外受累天气台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.LXTSMX).getNemCode());//离线台数
+                gfztls.add(proBasicPowerstationPointService.getPowerstationPoint(str2, ContantXk.TXZDTSMX).getNemCode());//通讯中断台数
 
                 List<PointData> gfztlist = edosUtil.getRealData(gfztls);
 
@@ -704,7 +704,7 @@ public class MonitorService {
                     ProBasicPowerstationPoint gfsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-2", ContantXk.SSZGL);
                     gfsjgl = edosUtil.getRealData(gfsjglvalue).getPointValueInDouble();
                 }
-                if (wpId.contains(FD)){
+                if (wpId.contains(FD)) {
                     ProBasicPowerstationPoint fdsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
                     fdsjgl = edosUtil.getRealData(fdsjglvalue).getPointValueInDouble();
                 }
@@ -796,8 +796,8 @@ public class MonitorService {
                     qt.put("fdzzjrl", rg.getJrwindCapacity() / 1000);
                     qt.put("gfzzjrl", rg.getJrCapacity() / 1000);
                     qt.put("zzjrl", (rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000);
-                    qt.put("ylyxs",(yfdl /10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
-                    qt.put("nlyxs",(nfdl /10000)/ ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
+                    qt.put("ylyxs", (yfdl / 10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
+                    qt.put("nlyxs", (nfdl / 10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
                 }
             }
 
@@ -806,8 +806,8 @@ public class MonitorService {
                     qt.put("fdzzjrl", cp.getJrwindCapacity() / 1000);
                     qt.put("gfzzjrl", cp.getJrCapacity() / 1000);
                     qt.put("zzjrl", (cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000);
-                    qt.put("ylyxs", (yfdl /10000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
-                    qt.put("nlyxs", (nfdl /10000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
+                    qt.put("ylyxs", (yfdl / 10000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
+                    qt.put("nlyxs", (nfdl / 10000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
                 }
             }
             for (ProBasicPowerstation wp : wplist) {
@@ -1538,7 +1538,7 @@ public class MonitorService {
             double temp2 = 0;
             for (int i = 0; i < llglls.size(); i++) {
                 temp2 = llglls.get(i).getPointValueInDouble();
-                vos.get(i).setLlgl(StringUtils.round(temp2, 2));
+                vos.get(i).setLlgl(StringUtils.round(temp2 / 1000, 2));
             }
         }
 
@@ -1547,7 +1547,7 @@ public class MonitorService {
             double temp3 = 0;
             for (int i = 0; i < sjglls.size(); i++) {
                 temp3 = sjglls.get(i).getPointValueInDouble();
-                vos.get(i).setSjgl(StringUtils.round(temp3, 2));
+                vos.get(i).setSjgl(StringUtils.round(temp3 / 1000, 2));
             }
         }
 
@@ -1556,7 +1556,7 @@ public class MonitorService {
             double temp4 = 0;
             for (int i = 0; i < gzzsls.size(); i++) {
                 temp4 = gzzsls.get(i).getPointValueInDouble();
-                vos.get(i).setGzzs(StringUtils.round(temp4, 2));
+                vos.get(i).setGzzs(StringUtils.round(temp4 / 1000, 2));
             }
         }
         if (uniformCode.contains("FNLYL")) {
@@ -1632,28 +1632,35 @@ public class MonitorService {
 
 
             if (wpId.contains(QS) || wpId.contains(FD) || wpId.contains(GF)) {
-                for (ProBasicPowerstation wp : wplist) {
-                    zjrl += wp.getJrCapacity() + wp.getJrwindCapacity();
-                }
-            } else {
-                for (ProBasicPowerstation wp : CacheContext.wpls) {
-                    if (wpId.equals(wp.getId())) {
-                        zjrl += wp.getJrCapacity() + wp.getJrwindCapacity();
+                for (ProBasicRegion rg : CacheContext.rgls) {
+                    if (wpId.contains(rg.getId())) {
+                        zjrl += rg.getJrCapacity() + rg.getJrwindCapacity();
                     }
                 }
-                for (ProBasicProject pj : CacheContext.pjls) {
-                    if (wpId.equals(pj.getId())) {
-                        zjrl += pj.getCapacity();
-                    }
-                }
-                for (ProBasicLine ln : CacheContext.lnls) {
-                    if (wpId.equals(ln.getId())) {
-                        zjrl += ln.getCapacity();
+                for (ProBasicCompany cp : CacheContext.cpls){
+                    if (wpId.contains(cp.getId())) {
+                        zjrl += cp.getJrCapacity() + cp.getJrwindCapacity();
                     }
                 }
+            }
 
+            for (ProBasicPowerstation wp : CacheContext.wpls) {
+                if (wpId.equals(wp.getId())) {
+                    zjrl += wp.getJrCapacity() + wp.getJrwindCapacity();
+                }
+            }
+            for (ProBasicProject pj : CacheContext.pjls) {
+                if (wpId.equals(pj.getId())) {
+                    zjrl += pj.getCapacity();
+                }
+            }
+            for (ProBasicLine ln : CacheContext.lnls) {
+                if (wpId.equals(ln.getId())) {
+                    zjrl += ln.getCapacity();
+                }
             }
 
+
             zjrlmap.put("zjrl", zjrl);
 
 
@@ -1716,9 +1723,9 @@ public class MonitorService {
                     temp0 = sj.get(0).getPointValueInDouble();
                     temp1 = sj.get(1).getPointValueInDouble();
                     temp2 = sj.get(2).getPointValueInDouble();
-                    vos.get(0).setNfdl(StringUtils.round(temp0 / zjrl, 2));
-                    vos.get(1).setNfdl(StringUtils.round(temp1 / zjrl, 2));
-                    vos.get(2).setNfdl(StringUtils.round(temp2 / zjrl, 2));
+                    vos.get(0).setNfdl(StringUtils.round((temp0 /10000) / (zjrl/1000), 2));
+                    vos.get(1).setNfdl(StringUtils.round((temp1 /10000)/ (zjrl/1000), 2));
+                    vos.get(2).setNfdl(StringUtils.round((temp2/10000)/ (zjrl/1000), 2));
 
                 }
 
@@ -1734,7 +1741,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() / zjrl, 2));
+                    vo1.setYfdl(DoubleUtils.keepPrecision((data.getPointValueInDouble() /10000) / (zjrl/1000), 2));
                     vo1.setHours(i);
                     vos.add(vo1);
                     date = DateUtils.addMonths(date, -1);
@@ -1790,7 +1797,7 @@ public class MonitorService {
 
             String month = wtpointmap.get(ContantXk.YFDL).getNemCode();
             String rfdl = wtpointmap.get(ContantXk.RFDL).getNemCode();
-            String nfdl = wtpointmap.get(ContantXk.RFDL).getNemCode();
+            String nfdl = wtpointmap.get(ContantXk.NFDL).getNemCode();
 
             if (timetype.contains("year")) {
                 Calendar cal = Calendar.getInstance();
@@ -1865,9 +1872,9 @@ public class MonitorService {
                     vos.get(1).setJhdl(StringUtils.round(twojhdlsum, 2));
                     vos.get(2).setJhdl(StringUtils.round(threejhdlsum, 2));
 
-                    vos.get(0).setSjdl(StringUtils.round(bnsjdlsum / 100, 2));
-                    vos.get(1).setSjdl(StringUtils.round(twosjdlsum / 100, 2));
-                    vos.get(2).setSjdl(StringUtils.round(threesjdlsum / 100, 2));
+                    vos.get(0).setSjdl(StringUtils.round(bnsjdlsum / 10000, 2));
+                    vos.get(1).setSjdl(StringUtils.round(twosjdlsum / 10000, 2));
+                    vos.get(2).setSjdl(StringUtils.round(threesjdlsum / 10000, 2));
 
                 }
             }
@@ -2010,8 +2017,8 @@ public class MonitorService {
                 double gfyfdlsj = 0.0;
                 double gfnfdlsj = 0.0;
 
-                String  fdstr = null;
-                String  gfstr = null;
+                String fdstr = null;
+                String gfstr = null;
 
                 String str = wpId;
 
@@ -2064,73 +2071,73 @@ public class MonitorService {
 
             }
 
-                for (ProBasicPowerstation wp : wplist) {
+            for (ProBasicPowerstation wp : wplist) {
 
-                    if (planmap.containsKey(wp.getId())) {
-                        Map<String, Double> valuemap = planmap.get(wp.getId());
+                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");
+                    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) {
+
+                        if (wpId.endsWith("STA")) {
+                            //日发电量
+                            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_sjdl = fd_r_sjdl + rfdlsj;
+                            fd_y_sjdl = fd_y_sjdl + yfdlsj;
+                            fd_n_sjdl = fd_n_sjdl + nfdlsj;
                         }
-                        if (wp.getId().indexOf("FDC_STA") >= 0) {
-
-                            if (wpId.endsWith("STA")) {
-                                //日发电量
-                                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_sjdl = fd_r_sjdl + rfdlsj;
-                                fd_y_sjdl = fd_y_sjdl + yfdlsj;
-                                fd_n_sjdl = fd_n_sjdl + nfdlsj;
-                            }
-                            fd_r_jhdl = fd_r_jhdl + yfdljh / 30;
-                            fd_y_jhdl = fd_y_jhdl + yfdljh;
-                            fd_n_jhdl = fd_n_jhdl + nfdljh;
-
-
-                        } else {
-
-                            if (wpId.endsWith("STA")) {
-                                //日发电量
-                                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_sjdl = gf_r_sjdl + rfdlsj;
-                                gf_y_sjdl = gf_y_sjdl + yfdlsj;
-                                gf_n_sjdl = gf_n_sjdl + nfdlsj;
-                            }
-                            gf_r_jhdl = gf_r_jhdl + yfdljh / 30;
-                            gf_y_jhdl = gf_y_jhdl + yfdljh;
-                            gf_n_jhdl = gf_n_jhdl + nfdljh;
+                        fd_r_jhdl = fd_r_jhdl + yfdljh / 30;
+                        fd_y_jhdl = fd_y_jhdl + yfdljh;
+                        fd_n_jhdl = fd_n_jhdl + nfdljh;
 
-                        }
 
+                    } else {
+
+                        if (wpId.endsWith("STA")) {
+                            //日发电量
+                            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_sjdl = gf_r_sjdl + rfdlsj;
+                            gf_y_sjdl = gf_y_sjdl + yfdlsj;
+                            gf_n_sjdl = gf_n_sjdl + nfdlsj;
+                        }
+                        gf_r_jhdl = gf_r_jhdl + yfdljh / 30;
+                        gf_y_jhdl = gf_y_jhdl + yfdljh;
+                        gf_n_jhdl = gf_n_jhdl + nfdljh;
 
                     }
 
+
                 }
 
+            }
+
 
             if (wpId.contains("FL")) {
                 gf_r_jhdl = 0;