Browse Source

利用小时修改

wangb@gyee-china.com 1 year ago
parent
commit
fa79966ec2

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

@@ -250,9 +250,11 @@ public class StationMonitorService {
         } else if (proBasicPowerstation.getWindType().equals("-2")) {
             zjrl = BigDecimal.valueOf(proBasicPowerstation.getJrCapacity() / 10000);
         }
-        resultMap.put("ylyxs", yfdl1.add(BigDecimal.valueOf(rfdl)).divide(zjrl ,2, RoundingMode.HALF_UP));
+//        resultMap.put("ylyxs", yfdl1.add(BigDecimal.valueOf(rfdl)).divide(zjrl ,2, RoundingMode.HALF_UP));
+        resultMap.put("ylyxs", yfdl1.divide(zjrl ,2, RoundingMode.HALF_UP));
 //        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.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("ysbklyl", realData.get(29).getPointValueInDouble());
         resultMap.put("ysbklyl",  Math.random() * 10 + 90);