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
Added check for validity of Json rule
Michael Rademakerce94d52f7f33
diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.javaindex 2b9a1e87d..9373d194c 100644--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java@@ -177,6 +177,39 @@ public class JsonRulesBuilder extends RulesBuilder {return;}+ //Check if rule is still valid+ if (ruleCondition.datetime != null) {+ long currentMillis = timerService.getCurrentTimeMillis();++ Pair<Long, Long> fromAndTo = AssetQueryPredicate.asFromAndTo(currentMillis, ruleCondition.datetime);+ boolean isValid = false;+ switch (ruleCondition.datetime.operator) {+ case BETWEEN:+ isValid = currentMillis >= fromAndTo.key && currentMillis < fromAndTo.value;+ break;+ case EQUALS:+ isValid = currentMillis == fromAndTo.key;+ break;+ case LESS_THAN:+ isValid = currentMillis < fromAndTo.key;+ break;+ case LESS_EQUALS:+ isValid = currentMillis <= fromAndTo.key;+ break;+ case GREATER_THAN:+ isValid = currentMillis > fromAndTo.key;+ break;+ case GREATER_EQUALS:+ isValid = currentMillis >= fromAndTo.key;+ break;+ }+ if (!isValid) {+ log(Level.FINEST, "Rule trigger is no longer valid so no match");+ lastTriggerResult = new RuleTriggerResult(false, Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList());+ return;+ }+ }+if (!TextUtil.isNullOrEmpty(ruleCondition.timer)) {lastTriggerResult = null;