100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Bug fix for JSON rules
Rich Turner395abeebb5ba
diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.javaindex a80de231d..5df0e8e20 100644--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java@@ -263,10 +263,6 @@ public class JsonRulesBuilder extends RulesBuilder {}}- // Remove matches that have an active recurrence timer- matchedAssetStates.removeIf(matchedAssetState -> nextRecurAssetIdMap.containsKey(matchedAssetState.getId())- && nextRecurAssetIdMap.get(matchedAssetState.getId()) > timerService.getCurrentTimeMillis());-// Remove previous matches where the asset state no longer matchespreviouslyMatchedAssetStates.removeIf(previousAssetState -> {@@ -279,6 +275,10 @@ public class JsonRulesBuilder extends RulesBuilder {return noLongerMatches;});+ // Remove matches that have an active recurrence timer+ matchedAssetStates.removeIf(matchedAssetState -> nextRecurAssetIdMap.containsKey(matchedAssetState.getId())+ && nextRecurAssetIdMap.get(matchedAssetState.getId()) > timerService.getCurrentTimeMillis());+// Filter out previous matches to avoid re-triggeringmatchedAssetStates.removeIf(previouslyMatchedAssetStates::contains);