Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fill in data for each 15 min.(in order to make OptimizationService work properly)

Michael Rademaker95e495be2e2b
diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java
index d2b3d60e4..390439dd0 100644
--- a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java
+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java
@@ -236,6 +236,7 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServi
if (responseModel != null) {
// Forecast date time is ISO8601 without 'T' so needs special formatter
LocalDateTime now = LocalDateTime.ofInstant(Instant.ofEpochMilli(timerService.getCurrentTimeMillis()), ZoneId.systemDefault());
+ LocalDateTime previousTimestamp = null;
boolean setActualValuePower = electricityProducerSolarAsset.isSetActualValueWithForecast().orElse(false);
boolean setActualValueForecastPower = true;
@@ -254,6 +255,14 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServi
setActualValuePower = false;
}
}
+ if (previousTimestamp != null && !previousTimestamp.toLocalDate().equals(timestamp.toLocalDate())) {
+ while (previousTimestamp.isBefore(timestamp)) {
+ previousTimestamp = previousTimestamp.plusMinutes(15);
+ assetPredictedDatapointService.updateValue(electricityProducerSolarAsset.getId(), ElectricityProducerSolarAsset.POWER_FORECAST.getName(), -wattItem.getValue() / 1000, previousTimestamp);
+ assetPredictedDatapointService.updateValue(electricityProducerSolarAsset.getId(), ElectricityProducerSolarAsset.POWER.getName(), -wattItem.getValue() / 1000, previousTimestamp);
+ }
+ }
+ previousTimestamp = timestamp;
}
rulesService.fireDeploymentsWithPredictedDataForAsset(electricityProducerSolarAsset.getId());
}
diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java
index 716c6e22b..563a5d014 100644
--- a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java
+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java
@@ -16,6 +16,7 @@ import org.openremote.model.Container;
import org.openremote.model.ContainerService;
import org.openremote.model.asset.impl.ElectricityProducerAsset;
import org.openremote.model.asset.impl.ElectricityProducerWindAsset;
+import org.openremote.model.asset.impl.WeatherAsset;
import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.query.AssetQuery;
@@ -279,6 +280,12 @@ public class ForecastWindService extends RouteBuilder implements ContainerServic
LocalDateTime timestamp = LocalDateTime.ofInstant(Instant.ofEpochMilli(weatherForecastModel.getTimestamp()), ZoneId.systemDefault());
assetPredictedDatapointService.updateValue(electricityProducerWindAsset.getId(), ElectricityProducerAsset.POWER_FORECAST.getName(), -powerForecast, timestamp);
assetPredictedDatapointService.updateValue(electricityProducerWindAsset.getId(), ElectricityProducerAsset.POWER.getName(), -powerForecast, timestamp);
+
+ for (int i = 0; i < 3; i++) {
+ timestamp = timestamp.plusMinutes(15);
+ assetPredictedDatapointService.updateValue(electricityProducerWindAsset.getId(), ElectricityProducerAsset.POWER_FORECAST.getName(), -powerForecast, timestamp);
+ assetPredictedDatapointService.updateValue(electricityProducerWindAsset.getId(), ElectricityProducerAsset.POWER.getName(), -powerForecast, timestamp);
+ }
}
rulesService.fireDeploymentsWithPredictedDataForAsset(electricityProducerWindAsset.getId());