利用小时容量取数修改

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

@@ -796,6 +796,9 @@ public class MonitorService {
 
             double yfdl8 = 0.0;
             double nfdl8 = 0.0;
+
+            double sxzjrl = 0.0;
+
             for (ProBasicEnergyGroup gp : gpls) {
                 if (wpId.contains(gp.getId())) {
                     qt.put("fdzzjrl", gp.getWindCapacity() / 1000);
@@ -814,9 +817,13 @@ public class MonitorService {
                        StringUtils.round(yfdl8 += dl.getYfdldb().doubleValue(),2);
                        StringUtils.round(nfdl8 += dl.getNfdldb().doubleValue(),2);
                     }
-                    qt.put("ylyxs", StringUtils.round(((yfdl8 + rfdlsj) / 10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 10000),2));
+
+                    for (ProBasicCompany cp : cpls) {
+                            sxzjrl += (cp.getJrwindCapacity() + cp.getJrCapacity()) / 10000;
+                    }
+                    qt.put("ylyxs", StringUtils.round(((yfdl8 + rfdlsj) / 10000) / sxzjrl,2));
 //                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
-                    qt.put("nlyxs", StringUtils.round(((nfdl8 + rfdlsj) / 10000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 10000),2));
+                    qt.put("nlyxs", StringUtils.round(((nfdl8 + rfdlsj) / 10000) / sxzjrl,2));
                 }
             }
 
@@ -829,6 +836,7 @@ public class MonitorService {
                     qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
                 }
             }
+
             for (ProBasicPowerstation wp : wplist) {
                 if (wpId.contains(wp.getId())) {