Merge remote-tracking branch 'origin/master'

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

@@ -255,7 +255,9 @@ public class StationMonitorService {
 //        resultMap.put("nlyxs", realData.get(27).getPointValueInDouble());
 //        resultMap.put("nlyxs", nfdl1.add(BigDecimal.valueOf(rfdl)).divide(zjrl ,2, RoundingMode.HALF_UP));
         resultMap.put("nlyxs", nfdl1.divide(zjrl ,2, RoundingMode.HALF_UP));
-        resultMap.put("yfgnlyl", realData.get(28).getPointValueInDouble());
+
+
+//        resultMap.put("yfgnlyl", realData.get(28).getPointValueInDouble());
         resultMap.put("ysbklyl", realData.get(29).getPointValueInDouble());
         resultMap.put("ysbklyl",  Math.random() * 10 + 90);
 
@@ -307,6 +309,15 @@ public class StationMonitorService {
         nslssdl = new BigDecimal(nslssdl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
         resultMap.put("nslssdl", nslssdl);
 
+
+        double llfdl = yfdl1.doubleValue()+ygzssdl+ywhssdl+yxnssdl+yxdssdl+yslssdl;
+        double yfgnlyl=0.0;
+        if(llfdl!=0)
+        {
+            yfgnlyl=yfdl1.divide(new BigDecimal(llfdl), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+        }
+
+        resultMap.put("yfgnlyl", yfgnlyl);
         resultMap.put("aqts", realData.get(66).getPointValueInDouble());
         resultMap.put("czmc", proBasicPowerstation.getAname());
         resultMap.put("czlx", proBasicPowerstation.getModel());