Skip to content

Fixed loading of forecast power limits after long server crash #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wborn merged 1 commit into from
Jan 14, 2026
Merged

Fixed loading of forecast power limits after long server crash #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 54 additions & 57 deletions ems/src/main/java/org/openremote/extension/ems/manager/EmsOptimisationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
package org.openremote.extension.ems.manager;

import org.apache.camel.builder.RouteBuilder;
import org.openremote.container.message.MessageBrokerService;
import org.openremote.container.timer.TimerService;
import org.openremote.extension.ems.agent.EmsElectricityBatteryAsset;
import org.openremote.extension.ems.agent.EmsEnergyOptimisationAsset;
import org.openremote.extension.ems.agent.EmsGOPACSAsset;
import org.openremote.extension.ems.manager.gopacs.GOPACSHandler;
import org.openremote.container.message.MessageBrokerService;
import org.openremote.container.timer.TimerService;
import org.openremote.manager.asset.AssetProcessingService;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.datapoint.AssetDatapointService;
Expand Down Expand Up @@ -164,9 +164,7 @@ private void startOptimisation(String assetId) {
ScheduledFuture<?> scheduledFuture = services.getScheduledExecutorService().scheduleAtFixedRate(command, 1, 1, TimeUnit.MINUTES);
energyOptimisationAssetsMap.put(assetId, scheduledFuture);

long currentTimeMillis = services.getTimerService().getCurrentTimeMillis();
long triggerTimeMillis = currentTimeMillis - currentTimeMillis % (15 * 60 * 1000) + (15 * 60 * 1000);
energyOptimisationTimersMap.put(assetId, triggerTimeMillis);
energyOptimisationTimersMap.put(assetId, 0L);
}

private void runOptimisation(String energyOptimisationAssetId) throws Exception {
Expand All @@ -178,37 +176,24 @@ private void runOptimisation(String energyOptimisationAssetId) throws Exception
}

long currentTimeMillis = services.getTimerService().getCurrentTimeMillis();
Long previousTimeMillis = energyOptimisationTimersMap.get(energyOptimisationAssetId);
Long triggerTimeMillis = energyOptimisationTimersMap.get(energyOptimisationAssetId);

// Update forecast attributes every 15 minutes
if (previousTimeMillis != null && currentTimeMillis > previousTimeMillis) {
if (triggerTimeMillis != null && currentTimeMillis > triggerTimeMillis) {
// Convert milliseconds to date
ZoneId zone = ZoneId.systemDefault();
LocalDate previousDate = Instant.ofEpochMilli(previousTimeMillis - 60000).atZone(zone).toLocalDate();
LocalDate previousDate = Instant.ofEpochMilli(triggerTimeMillis - 60000).atZone(zone).toLocalDate();
LocalDate currentDate = Instant.ofEpochMilli(currentTimeMillis).atZone(zone).toLocalDate();

// Update forecasts after midnight
// Update manual forecasts after midnight
if (!currentDate.equals(previousDate)) {
updatePowerLimitProfileForecasts(energyOptimisationAsset);
updatePowerLimitProfileManualForecasts(energyOptimisationAsset);
}

long triggerTimeMillis = currentTimeMillis - currentTimeMillis % (15 * 60 * 1000) + (15 * 60 * 1000);
energyOptimisationTimersMap.put(energyOptimisationAssetId, triggerTimeMillis);

EmsGOPACSAsset gopacsAsset = getGopacsAsset(energyOptimisationAsset);

if (gopacsAsset != null) {
// Update power limit profile totals
updatePowerLimitProfileTotalForecasts(energyOptimisationAsset, gopacsAsset);

// Update GOPACS asset attributes
String[] gopacsAttributeNames = new String[]{
EmsGOPACSAsset.POWER_LIMIT_MAXIMUM_PROFILE_FLEX_ORDER.getName(),
EmsGOPACSAsset.POWER_LIMIT_MINIMUM_PROFILE_FLEX_ORDER.getName()
};

updatePowerLimitProfileAttributes(gopacsAsset, gopacsAttributeNames);
}
// Update total forecasts
updatePowerLimitProfileTotalForecasts(energyOptimisationAsset, gopacsAsset);

// Update energy optimisation asset attributes
String[] energyOptimisationAssetAttributeNames = new String[]{
Expand All @@ -221,6 +206,20 @@ private void runOptimisation(String energyOptimisationAssetId) throws Exception
};

updatePowerLimitProfileAttributes(energyOptimisationAsset, energyOptimisationAssetAttributeNames);

if (gopacsAsset != null) {
// Update GOPACS asset attributes
String[] gopacsAttributeNames = new String[]{
EmsGOPACSAsset.POWER_LIMIT_MAXIMUM_PROFILE_FLEX_ORDER.getName(),
EmsGOPACSAsset.POWER_LIMIT_MINIMUM_PROFILE_FLEX_ORDER.getName()
};

updatePowerLimitProfileAttributes(gopacsAsset, gopacsAttributeNames);
}

// Calculate new trigger time
triggerTimeMillis = currentTimeMillis - currentTimeMillis % (15 * 60 * 1000) + (15 * 60 * 1000);
energyOptimisationTimersMap.put(energyOptimisationAssetId, triggerTimeMillis);
}

// Run selected optimisation method
Expand Down Expand Up @@ -487,26 +486,20 @@ private void processAttributeEventEmsGOPACSAsset(AttributeEvent attributeEvent)
}
}

private void updatePowerLimitProfileForecasts(EmsEnergyOptimisationAsset energyOptimisationAsset) {
String energyOptimisationAssetId = energyOptimisationAsset.getId();
private void updatePowerLimitProfileManualForecasts(EmsEnergyOptimisationAsset energyOptimisationAsset) {
String logPrefix = String.format("assetType='%s', assetId='%s', assetName='%s'", energyOptimisationAsset.getAssetType(), energyOptimisationAsset.getId(), energyOptimisationAsset.getAssetName());

// Update forecast with new day one week from now
long currentTimeMillis = services.getTimerService().getCurrentTimeMillis();
long startTimeMillis = currentTimeMillis - currentTimeMillis % (24 * 60 * 60000) + (7L * 24 * 60 * 60000);
long endTimeMillis = startTimeMillis + (24 * 60 * 60000);

String[] powerLimitTypes = {"maximum", "minimum"};

for (String powerLimitType : powerLimitTypes) {
String powerLimitProfileManualInput = energyOptimisationAsset.getPowerLimitMaximumProfileManualInput().orElse("");
String powerLimitProfileManualAttributeName = EmsEnergyOptimisationAsset.POWER_LIMIT_MAXIMUM_PROFILE_MANUAL.getName();
String powerLimitProfileTotalAttributeName = EmsEnergyOptimisationAsset.POWER_LIMIT_MAXIMUM_PROFILE_TOTAL.getName();
String powerLimitProfileManualInput;
String powerLimitProfileManualAttributeName;

if (powerLimitType.equals("minimum")) {
if (powerLimitType.equals("maximum")) {
powerLimitProfileManualInput = energyOptimisationAsset.getPowerLimitMaximumProfileManualInput().orElse("");
powerLimitProfileManualAttributeName = EmsEnergyOptimisationAsset.POWER_LIMIT_MAXIMUM_PROFILE_MANUAL.getName();
} else {
powerLimitProfileManualInput = energyOptimisationAsset.getPowerLimitMinimumProfileManualInput().orElse("");
powerLimitProfileManualAttributeName = EmsEnergyOptimisationAsset.POWER_LIMIT_MINIMUM_PROFILE_MANUAL.getName();
powerLimitProfileTotalAttributeName = EmsEnergyOptimisationAsset.POWER_LIMIT_MINIMUM_PROFILE_TOTAL.getName();
}

if (powerLimitProfileManualInput.isBlank()) {
Expand All @@ -519,13 +512,8 @@ private void updatePowerLimitProfileForecasts(EmsEnergyOptimisationAsset energyO
// Convert parsed CSV to database insertable data-points
List<ValueDatapoint<?>> powerLimitProfileManual = csvToValueDatapoints(parsedCSV, logPrefix);

List<ValueDatapoint<?>> powerLimitProfileManualFiltered = powerLimitProfileManual
.stream()
.filter(dp -> dp.getTimestamp() >= startTimeMillis && dp.getTimestamp() <= endTimeMillis)
.toList();

services.getAssetPredictedDatapointService().updateValues(energyOptimisationAssetId, powerLimitProfileManualAttributeName, powerLimitProfileManualFiltered);
services.getAssetPredictedDatapointService().updateValues(energyOptimisationAssetId, powerLimitProfileTotalAttributeName, powerLimitProfileManualFiltered);
// Update manual forecast
services.getAssetPredictedDatapointService().updateValues(energyOptimisationAsset.getId(), powerLimitProfileManualAttributeName, powerLimitProfileManual);
}
}

Expand Down Expand Up @@ -568,22 +556,31 @@ private void updatePowerLimitProfileTotalForecasts(EmsEnergyOptimisationAsset en
AssetDatapointAllQuery assetDatapointQuery = new AssetDatapointAllQuery(startTimeMillis, endTimeMillis);

// Get power limit profiles
List<ValueDatapoint<?>> powerLimitMaximumProfileDayAhead = services.getAssetPredictedDatapointService().queryDatapoints(gopacsAsset.getId(), EmsGOPACSAsset.POWER_LIMIT_MAXIMUM_PROFILE_FLEX_ORDER.getName(), assetDatapointQuery);
List<ValueDatapoint<?>> powerLimitMaximumProfileManual = services.getAssetPredictedDatapointService().queryDatapoints(energyOptimisationAssetId, EmsEnergyOptimisationAsset.POWER_LIMIT_MAXIMUM_PROFILE_MANUAL.getName(), assetDatapointQuery);
List<ValueDatapoint<?>> powerLimitMinimumProfileDayAhead = services.getAssetPredictedDatapointService().queryDatapoints(gopacsAsset.getId(), EmsGOPACSAsset.POWER_LIMIT_MINIMUM_PROFILE_FLEX_ORDER.getName(), assetDatapointQuery);
List<ValueDatapoint<?>> powerLimitMinimumProfileManual = services.getAssetPredictedDatapointService().queryDatapoints(energyOptimisationAssetId, EmsEnergyOptimisationAsset.POWER_LIMIT_MINIMUM_PROFILE_MANUAL.getName(), assetDatapointQuery);

// Calculate power limit profile totals
List<List<ValueDatapoint<?>>> powerLimitMaximumProfiles = new ArrayList<>();
powerLimitMaximumProfiles.add(powerLimitMaximumProfileDayAhead);
powerLimitMaximumProfiles.add(powerLimitMaximumProfileManual);
List<ValueDatapoint<?>> powerLimitMaximumProfileTotal;
List<ValueDatapoint<?>> powerLimitMinimumProfileTotal;

if (gopacsAsset != null) {
List<ValueDatapoint<?>> powerLimitMaximumProfileDayAhead = services.getAssetPredictedDatapointService().queryDatapoints(gopacsAsset.getId(), EmsGOPACSAsset.POWER_LIMIT_MAXIMUM_PROFILE_FLEX_ORDER.getName(), assetDatapointQuery);
List<ValueDatapoint<?>> powerLimitMinimumProfileDayAhead = services.getAssetPredictedDatapointService().queryDatapoints(gopacsAsset.getId(), EmsGOPACSAsset.POWER_LIMIT_MINIMUM_PROFILE_FLEX_ORDER.getName(), assetDatapointQuery);

List<List<ValueDatapoint<?>>> powerLimitMinimumProfiles = new ArrayList<>();
powerLimitMinimumProfiles.add(powerLimitMinimumProfileDayAhead);
powerLimitMinimumProfiles.add(powerLimitMinimumProfileManual);
// Calculate power limit profile totals
List<List<ValueDatapoint<?>>> powerLimitMaximumProfiles = new ArrayList<>();
powerLimitMaximumProfiles.add(powerLimitMaximumProfileDayAhead);
powerLimitMaximumProfiles.add(powerLimitMaximumProfileManual);

List<ValueDatapoint<?>> powerLimitMaximumProfileTotal = calculatePowerLimitProfileTotal(powerLimitMaximumProfiles, "floor");
List<ValueDatapoint<?>> powerLimitMinimumProfileTotal = calculatePowerLimitProfileTotal(powerLimitMinimumProfiles, "ceil");
List<List<ValueDatapoint<?>>> powerLimitMinimumProfiles = new ArrayList<>();
powerLimitMinimumProfiles.add(powerLimitMinimumProfileDayAhead);
powerLimitMinimumProfiles.add(powerLimitMinimumProfileManual);

powerLimitMaximumProfileTotal = calculatePowerLimitProfileTotal(powerLimitMaximumProfiles, "floor");
powerLimitMinimumProfileTotal = calculatePowerLimitProfileTotal(powerLimitMinimumProfiles, "ceil");
} else {
powerLimitMaximumProfileTotal = powerLimitMaximumProfileManual;
powerLimitMinimumProfileTotal = powerLimitMinimumProfileManual;
}

// Update power limit profile totals
services.getAssetPredictedDatapointService().updateValues(energyOptimisationAssetId, EmsEnergyOptimisationAsset.POWER_LIMIT_MAXIMUM_PROFILE_TOTAL.getName(), powerLimitMaximumProfileTotal);
Expand Down Expand Up @@ -795,4 +792,4 @@ private List<ValueDatapoint<?>> calculatePowerLimitProfileTotal(List<List<ValueD

return powerLimitProfileTotal;
}
}
}
Loading