侧边栏数据修改

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

@@ -133,23 +133,23 @@ public class MonitorService {
             /**********************************************首页穿透线路信息统计**********************************************************/
 
 
-            Map<String, Object> xlmap = new LinkedHashMap<>();
-
-            if (!wpls1.isEmpty()) {
-                double xlgl = 0.0;
-                double i = 0;
-                for (ProBasicLine ls : CacheContext.lnls) {
-                    Map<String, Double> xl = new LinkedHashMap<>();
-                    String lineid = ls.getId();
-                    i++;
-                    ProBasicPowerstationPoint xlglvalue = proBasicPowerstationPointService.getPowerstationPoint(lineid, ContantXk.SSZGL);
-                    xlgl = edosUtil.getRealData(xlglvalue).getPointValueInDouble();
-                    xl.put("i", i);
-                    xl.put("xlgl", MathUtil.twoBit(xlgl));
-                    xlmap.put(lineid, xl);
-                }
-            }
-            map.put("xlmap", xlmap);
+//            Map<String, Object> xlmap = new LinkedHashMap<>();
+//
+//            if (!wpls1.isEmpty()) {
+//                double xlgl = 0.0;
+//                double i = 0;
+//                for (ProBasicLine ls : CacheContext.lnls) {
+//                    Map<String, Double> xl = new LinkedHashMap<>();
+//                    String lineid = ls.getId();
+//                    i++;
+//                    ProBasicPowerstationPoint xlglvalue = proBasicPowerstationPointService.getPowerstationPoint(lineid, ContantXk.SSZGL);
+//                    xlgl = edosUtil.getRealData(xlglvalue).getPointValueInDouble();
+//                    xl.put("i", i);
+//                    xl.put("xlgl", MathUtil.twoBit(xlgl));
+//                    xlmap.put(lineid, xl);
+//                }
+//            }
+//            map.put("xlmap", xlmap);
 
 
             /**********************************************首页穿透线路信息统计**********************************************************/
@@ -756,6 +756,30 @@ public class MonitorService {
             double jr_fj_ts = 0;
             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;
+
             if (!cplist.isEmpty()) {
                 for (ProBasicCompany pg : cplist) {
 
@@ -788,6 +812,53 @@ public class MonitorService {
                     //接入光伏集中数量
                     jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
 
+                    if (pg.getId().contains("FLFD")){
+                        //风电装机容量
+                        flfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        //接入风电装机容量
+                        jr_flfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        //风场数量
+                        flfd_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
+                        //接入风场数量
+                        jr_flfdfcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
+                        //风机数量
+                        flfdfj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
+                        //接入风机数量
+                        jr_flfdfj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
+                    } else if (pg.getId().contains("GFFD")){
+                        //清洁能源光伏装机容量
+                        gffd_zjrl += null != pg.getCapacity() ? pg.getCapacity() : 0.0;
+                        //接入光伏装机容量
+                        jr_gffd_zjrl += null != pg.getJrCapacity() ? pg.getJrCapacity() : 0.0;
+                        //清洁能源光伏电站数量
+                        gffdts += null != pg.getNumber() ? pg.getNumber() : 0.0;
+                        //接入光伏电站数量
+                        jr_gffdts += null != pg.getJrNumber() ? pg.getJrNumber() : 0.0;
+                        //清洁能源光伏组串数量
+                        gffd_zcts += null != pg.getQuantityZc() ? pg.getQuantityZc() : 0.0;
+                        //清洁能源光伏集中数量
+                        gffd_jzts += null != pg.getQuantityJz() ? pg.getQuantityJz() : 0.0;
+                        //接入光伏组串数量
+                        jr_gffd_zcts += null != pg.getJrquantityZc() ? pg.getJrquantityZc() : 0.0;
+                        //接入光伏集中数量
+                        jr_gffd_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
+
+                    }else if (pg.getId().contains("QH")){
+
+                        //七和风电装机容量
+                        qhfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        //接入七和风电装机容量
+                        jr_qhfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
+                        //七和风场数量
+                        qhfd_fcts += null != pg.getWindNumber() ? pg.getWindNumber() : 0.0;
+                        //接入七和风场数量
+                        jr_qhfdfcts += null != pg.getJrWindNumber() ? pg.getJrWindNumber() : 0.0;
+                        //七和风机数量
+                        qhfdfj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
+                        //接入七和风机数量
+                        jr_qhfdfj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
+                    }
+
                 }
             }
             Map<String, Double> cblpoint = new LinkedHashMap<>();
@@ -808,6 +879,32 @@ public class MonitorService {
             cblpoint.put("jr_gf_zcts", StringUtils.round(jr_gf_zcts, 2));
             cblpoint.put("jr_gf_jzts", StringUtils.round(jr_gf_jzts, 2));
 
+            //风力发电公司
+            cblpoint.put("flfd_zjrl", StringUtils.round(flfd_zjrl, 2));
+            cblpoint.put("jr_flfd_zjrl", StringUtils.round(jr_flfd_zjrl, 2));
+            cblpoint.put("flfd_fcts", StringUtils.round(flfd_fcts, 2));
+            cblpoint.put("jr_flfdfcts", StringUtils.round(jr_flfdfcts, 2));
+            cblpoint.put("flfdfj_ts", StringUtils.round(flfdfj_ts, 2));
+            cblpoint.put("jr_flfdfj_ts", StringUtils.round(jr_flfdfj_ts, 2));
+
+            //光伏发电公司
+            cblpoint.put("gffd_zjrl", StringUtils.round(gffd_zjrl, 2));
+            cblpoint.put("jr_gffd_zjrl", StringUtils.round(jr_gffd_zjrl, 2));
+            cblpoint.put("gffdts", StringUtils.round(gffdts, 2));
+            cblpoint.put("jr_gffdts", StringUtils.round(jr_gffdts, 2));
+            cblpoint.put("gffd_jzts", StringUtils.round(gffd_jzts, 2));
+            cblpoint.put("gffd_zcts", StringUtils.round(gffd_zcts, 2));
+            cblpoint.put("jr_gffd_zcts", StringUtils.round(jr_gffd_zcts, 2));
+            cblpoint.put("jr_gffd_jzts", StringUtils.round(jr_gffd_jzts, 2));
+
+            //七和发电公司
+            cblpoint.put("qhfd_zjrl", StringUtils.round(qhfd_zjrl, 2));
+            cblpoint.put("jr_qhfd_zjrl", StringUtils.round(jr_qhfd_zjrl, 2));
+            cblpoint.put("qhfd_fcts", StringUtils.round(qhfd_fcts, 2));
+            cblpoint.put("jr_qhfdfcts", StringUtils.round(jr_qhfdfcts, 2));
+            cblpoint.put("qhfdfj_ts", StringUtils.round(qhfdfj_ts, 2));
+            cblpoint.put("jr_qhfdfj_ts", StringUtils.round(jr_qhfdfj_ts, 2));
+
             map.put("cblpoint", cblpoint);
 
             /**********************************************首页清洁能源公司以及系统接入信息展示**********************************************************/