增加风电光伏实际功率

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

@@ -307,6 +307,8 @@ public class MonitorService {
             double co2 = 0.0;
             double so2 = 0.0;
 
+            double fdsjgl =0.0;
+            double gfsjgl =0.0;
 
             Map<String, Object> zjrlmap = new HashMap<>();
 
@@ -382,6 +384,20 @@ public class MonitorService {
                 //节约煤
                 ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
                 jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
+
+
+                for (ProBasicPowerstation wp : wplist) {
+                    if (wp.getId().contains("F")) {
+                        //实时功率
+                        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();
+                    }
+                }
+
             } else {
                 //安全天数
                 ProBasicPowerstationPoint aqtsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.AQTS);
@@ -443,6 +459,8 @@ public class MonitorService {
             qt.put("jym", MathUtil.twoBit(jym));
             qt.put("co2", MathUtil.twoBit(co2));
             qt.put("so2", MathUtil.twoBit(so2));
+            qt.put("fdsjgl", MathUtil.twoBit(fdsjgl));
+            qt.put("gfsjgl", MathUtil.twoBit(gfsjgl));
 
             qt.put("ylyxs", yfdl / (zjrl/1000));
             qt.put("nlyxs", nfdl / (zjrl/1000));