|
@@ -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);
|