|
@@ -176,13 +176,21 @@ public class UltraShortTermPowerForecastingController extends BaseController
|
|
|
double power = parsePower(timePowerConsumer.apply(data));
|
|
double power = parsePower(timePowerConsumer.apply(data));
|
|
|
double actualPower = realData != null ? realData.getActualPower() : 0D;
|
|
double actualPower = realData != null ? realData.getActualPower() : 0D;
|
|
|
UltraShortTermPowerForecastOnceData onceData = new UltraShortTermPowerForecastOnceData().setTime(TimeUtils.utcToGmt8Format(time))
|
|
UltraShortTermPowerForecastOnceData onceData = new UltraShortTermPowerForecastOnceData().setTime(TimeUtils.utcToGmt8Format(time))
|
|
|
- .setPower(power)
|
|
|
|
|
- .setMonitoredPower(actualPower)
|
|
|
|
|
- .setBias(actualPower - power)
|
|
|
|
|
|
|
+ .setPower(round4(power))
|
|
|
|
|
+ .setMonitoredPower(round4(actualPower))
|
|
|
|
|
+ .setBias(round4(actualPower - power))
|
|
|
;
|
|
;
|
|
|
return onceData;
|
|
return onceData;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 数值保留4位小数(四舍五入)
|
|
|
|
|
+ */
|
|
|
|
|
+ private double round4(double value)
|
|
|
|
|
+ {
|
|
|
|
|
+ return BigDecimal.valueOf(value).setScale(4, RoundingMode.HALF_UP).doubleValue();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private double parsePower(String power)
|
|
private double parsePower(String power)
|
|
|
{
|
|
{
|
|
|
if (power == null || power.trim().isEmpty())
|
|
if (power == null || power.trim().isEmpty())
|
|
@@ -238,7 +246,7 @@ public class UltraShortTermPowerForecastingController extends BaseController
|
|
|
{
|
|
{
|
|
|
UltraShortTermPowerForecastData data = toData(entry.getKey(), entry.getValue());
|
|
UltraShortTermPowerForecastData data = toData(entry.getKey(), entry.getValue());
|
|
|
if(realDataMap.containsKey(entry.getKey())){
|
|
if(realDataMap.containsKey(entry.getKey())){
|
|
|
- data.setMonitoredPower(realDataMap.get(entry.getKey()).getActualPower());
|
|
|
|
|
|
|
+ data.setMonitoredPower(round4(realDataMap.get(entry.getKey()).getActualPower()));
|
|
|
}
|
|
}
|
|
|
result.add(data);
|
|
result.add(data);
|
|
|
}
|
|
}
|