Skip to content

armgit / core

Public Imported from GitHub
0

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

Correctly initiate solar forecast service on asset creation (#1439)

Igor Rutkab6feb0afa0ae
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 aaf7dc936..0e59ef22e 100644
--- a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java
+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java
@@ -256,8 +256,12 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServi
protected void processAssetChange(PersistenceEvent<ElectricityProducerSolarAsset> persistenceEvent) {
LOG.fine("Processing producer solar asset change: " + persistenceEvent);
- // Remove asset from solar forecast map on asset deletion
- if (persistenceEvent.getCause() == PersistenceEvent.Cause.DELETE) {
+
+ if (persistenceEvent.getCause() == PersistenceEvent.Cause.CREATE && persistenceEvent.getEntity().isIncludeForecastSolarService().orElse(false)) {
+ electricityProducerSolarAssetMap.put(persistenceEvent.getEntity().getId(), persistenceEvent.getEntity());
+ getSolarForecast(persistenceEvent.getEntity());
+ updateSolarForecastAttribute(persistenceEvent.getEntity());
+ } else if (persistenceEvent.getCause() == PersistenceEvent.Cause.DELETE) {
electricityProducerSolarAssetMap.remove(persistenceEvent.getEntity().getId());
}
}
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java
index fccd65cf3..cabec5707 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java
@@ -52,7 +52,7 @@ public class ElectricityProducerSolarAsset extends ElectricityProducerAsset {
public static final AttributeDescriptor<Boolean> INCLUDE_FORECAST_SOLAR_SERVICE = new AttributeDescriptor<>("includeForecastSolarService", BOOLEAN);
- public static final AttributeDescriptor<Boolean> SET_ACTUAL_SOLAR_VALUE_WITH_FORECAST = new AttributeDescriptor<>("setActualSolarPowerValueWithForecast", BOOLEAN);
+ public static final AttributeDescriptor<Boolean> SET_ACTUAL_SOLAR_VALUE_WITH_FORECAST = new AttributeDescriptor<>("setActualSolarValueWithForecast", BOOLEAN);
public static final AssetDescriptor<ElectricityProducerSolarAsset> DESCRIPTOR = new AssetDescriptor<>("white-balance-sunny", "EABB4D", ElectricityProducerSolarAsset.class);