首页修改

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

@@ -21,12 +21,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.gyee.runeconomy.init.CacheContext.pjls;
-
 @Service
 public class MonitorService {
     private static Logger logger = LoggerFactory.getLogger(MonitorService.class);
@@ -121,6 +118,7 @@ public class MonitorService {
                         xx.put("companyid", wp.getCompanyId());
                         xx.put("zjts", Double.valueOf(wp.getJrwindQuantityLd()));
                         xx.put("zjrl", wp.getJrwindCapacity());
+                        xx.put("hszjts", wp.getJrwindQuantityHs());
                         double gl = 0.0;
                         ProBasicPowerstationPoint glvalue = proBasicPowerstationPointService.getPowerstationPoint(id, ContantXk.SSZGL);
                         gl = edosUtil.getRealData(glvalue).getPointValueInDouble();
@@ -230,25 +228,32 @@ public class MonitorService {
 
             Map<String, Double> mxztmap = new LinkedHashMap<>();
 
-            if (wpId.endsWith(QS) || wpId.endsWith(FD) || wpId.endsWith(GF)){
+            if (wpId.endsWith(QS) || wpId.endsWith(FD) || wpId.endsWith(GF)) {
 
                 List<String> fjztls = new ArrayList<>();
                 List<String> gfztls = new ArrayList<>();
 
-                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());//通讯中断台数
+                String str1 =null;
+                if (wpId.endsWith(QS)) {
+                    String str = wpId;
+                   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());//通讯中断台数
 
                 List<PointData> fjztlist = edosUtil.getRealData(fjztls);
 
@@ -266,21 +271,27 @@ public class MonitorService {
                 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());//通讯中断台数
+                String str2 =null;
+                if (wpId.endsWith(QS)) {
+                    String str = wpId;
+                    str2 = str.substring(0, str.indexOf("0")) + "-2";
+                }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());//通讯中断台数
 
                 List<PointData> gfztlist = edosUtil.getRealData(gfztls);
 
@@ -379,51 +390,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++) {
@@ -684,13 +695,13 @@ public class MonitorService {
                 ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
                 jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
 
-                if (wpId.contains(QS)){
+                if (wpId.contains(QS)) {
 
                     String str = wpId;
                     //实时功率
-                    ProBasicPowerstationPoint fdsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0,str.indexOf("0")) + "-1", ContantXk.SSZGL);
+                    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);
+                    ProBasicPowerstationPoint gfsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(str.substring(0, str.indexOf("0")) + "-2", ContantXk.SSZGL);
                     gfsjgl = edosUtil.getRealData(gfsjglvalue).getPointValueInDouble();
                 }
 
@@ -777,8 +788,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", (czyfdl/10000)/((rg.getJrwindCapacity() + rg.getJrCapacity())/ 1000));
-                    qt.put("nlyxs", (cznfdl/10000)/((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));
                 }
             }
 
@@ -787,15 +798,15 @@ 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", (czyfdl/10000)/((cp.getJrwindCapacity() + cp.getJrCapacity())/ 1000));
-                    qt.put("nlyxs", (cznfdl/10000)/((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("ylyxs", (yfdl / 10000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
+                    qt.put("nlyxs", (nfdl / 10000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
                 }
             }
             qt.put("aqts", MathUtil.twoBit(aqts));
@@ -814,8 +825,6 @@ public class MonitorService {
             qt.put("gfsjgl", MathUtil.twoBit(gfsjgl));
 
 
-
-
             map.put("qt", qt);
             /**********************************************首页安全天数、实时功率及节能减排等信息统计**********************************************************/
 
@@ -1147,28 +1156,8 @@ public class MonitorService {
             double jr_gf_zcts = 0;
             double jr_gf_jzts = 0;
 
-            double flfd_zjrl = 0;
-            double jr_flfd_zjrl = 0;
-            double flfd_fcts = 0;
-            double jr_flfdfcts = 0;
-            double flfdfj_ts = 0;
-            double jr_flfdfj_ts = 0;
-
-            double gffd_zjrl = 0;
-            double jr_gffd_zjrl = 0;
-            double gffdts = 0;
-            double jr_gffdts = 0;
-            double gffd_zcts = 0;
-            double jr_gffd_zcts = 0;
-            double gffd_jzts = 0;
-            double jr_gffd_jzts = 0;
-
-            double qhfd_zjrl = 0;
-            double jr_qhfd_zjrl = 0;
-            double qhfd_fcts = 0;
-            double jr_qhfdfcts = 0;
-            double qhfdfj_ts = 0;
-            double jr_qhfdfj_ts = 0;
+            double qjny_hsfj_ts = 0;
+
 
             List<ProBasicCompany> cplist = CacheContext.cpls1;
 
@@ -1210,6 +1199,8 @@ public class MonitorService {
                         //接入光伏集中数量
                         jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
 
+                        qjny_hsfj_ts += null != pg.getJrwindQuantityHs() ? pg.getJrwindQuantityHs() : 0.0;
+
                     } else if (wpId.contains(pg.getId()) && pg.getOrderNum().equals(1)) {  //风电公司
                         //清洁能源风电装机容量
                         qjny_fd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
@@ -1239,6 +1230,7 @@ public class MonitorService {
                         jr_gf_zcts += null != pg.getJrquantityZc() ? pg.getJrquantityZc() : 0.0;
                         //接入光伏集中数量
                         jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
+                        qjny_hsfj_ts += null != pg.getJrwindQuantityHs() ? pg.getJrwindQuantityHs() : 0.0;
 
                     } else if (wpId.contains(pg.getId()) && pg.getOrderNum().equals(3)) {   //光伏公司
 
@@ -1270,6 +1262,7 @@ public class MonitorService {
                         jr_gf_zcts += null != pg.getJrquantityZc() ? pg.getJrquantityZc() : 0.0;
                         //接入光伏集中数量
                         jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
+                        qjny_hsfj_ts += null != pg.getJrwindQuantityHs() ? pg.getJrwindQuantityHs() : 0.0;
 
                     } else if (wpId.contains(pg.getId()) && pg.getOrderNum().equals(2)) {  //七和
 
@@ -1302,6 +1295,8 @@ public class MonitorService {
                         //接入光伏集中数量
                         jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
 
+                        qjny_hsfj_ts += null != pg.getJrwindQuantityHs() ? pg.getJrwindQuantityHs() : 0.0;
+
                     }
 
                 }
@@ -1322,6 +1317,7 @@ 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));
+                cblpoint.put("qjny_hsfj_ts", StringUtils.round(qjny_hsfj_ts, 2));
 
 
             }
@@ -1362,6 +1358,8 @@ public class MonitorService {
                         //接入光伏集中数量
                         jr_gf_jzts += null != pg1.getJrquantityJz() ? pg1.getJrquantityJz() : 0.0;
 
+                        qjny_hsfj_ts += null != pg1.getJrwindQuantityHs() ? pg1.getJrwindQuantityHs() : 0.0;
+
                     }
                 }
                 cblpoint.put("qjny_fd_zjrl", StringUtils.round(qjny_fd_zjrl / 1000, 2));
@@ -1380,6 +1378,7 @@ 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));
+                cblpoint.put("qjny_hsfj_ts", StringUtils.round(qjny_hsfj_ts, 2));
 
             }
 
@@ -1402,7 +1401,7 @@ public class MonitorService {
                     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")){
+                } else if (wpId.contains(wp.getId()) && wp.getSpare4().equals("2")) {
 
                     //清洁能源光伏装机容量
                     qjny_gf_zjrl += null != wp.getCapacity() ? wp.getCapacity() : 0.0;
@@ -1858,9 +1857,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 / 100, 2));
+                    vos.get(1).setSjdl(StringUtils.round(twosjdlsum / 100, 2));
+                    vos.get(2).setSjdl(StringUtils.round(threesjdlsum / 100, 2));
 
                 }
             }
@@ -1887,7 +1886,7 @@ public class MonitorService {
                         vo.setHours(i);
 
                         PointData data = edosUtil.getSectionData(month, DateUtils.getEndOfDay(DateUtils.getMonthLast(date)).getTime());
-                        vo.setSjdl(DoubleUtils.keepPrecision(data.getPointValueInDouble() /10000, 2));
+                        vo.setSjdl(DoubleUtils.keepPrecision(data.getPointValueInDouble() / 10000, 2));
                         date = DateUtils.addMonths(date, -1);
                         vos.add(vo);
                         SortUtils.sort(vos, "hours", SortUtils.ASC);
@@ -1916,7 +1915,7 @@ public class MonitorService {
                         ProjectplanVo vo = new ProjectplanVo();
                         vo.setJhdl(StringUtils.round(byjhdlsum / 30, 2));
                         PointData data = edosUtil.getSectionData(rfdl, DateUtils.getEndOfDay(date).getTime());
-                        vo.setSjdl(DoubleUtils.keepPrecision(data.getPointValueInDouble() /10000, 2));
+                        vo.setSjdl(DoubleUtils.keepPrecision(data.getPointValueInDouble() / 10000, 2));
                         date = DateUtils.addDays(date, -1);
 
                         vo.setHours(i);
@@ -2049,26 +2048,25 @@ public class MonitorService {
                     }
 
 
-
                 }
 
             }
 
-        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;
-        }
+            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<>();
 
@@ -2098,6 +2096,7 @@ public class MonitorService {
         }
         return map;
     }
+
     /**********************************************计划电量统计**********************************************************/
     private void setPlanInfoByType
     (Map<String, Map<String, Double>> gxkmap, List<ProBasicProjectPlan> planls, String wpId) {