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 PredictedDatapoints facade to Rules
Michael Rademaker91c5b72ead86
diff --git a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.javaindex e7780825d..7a18fc59f 100644--- a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java@@ -149,7 +149,7 @@ public class AssetPredictedDatapointService implements ContainerService {Value value = rs.getObject(2) != null ? Values.parseOrNull(rs.getString(2)) : null;result.add(new ValueDatapoint<>(rs.getTimestamp(1).getTime(), value));}- return result.toArray(new ValueDatapoint[result.size()]);+ return result.toArray(new ValueDatapoint[0]);}}}diff --git a/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.javaindex 6983601c3..1a36a9244 100644--- a/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.java@@ -8,6 +8,7 @@ import org.openremote.manager.rules.facade.NotificationsFacade;import org.openremote.manager.rules.flow.*;import org.openremote.model.rules.Assets;import org.openremote.model.rules.Notifications;+import org.openremote.model.rules.PredictedDatapoints;import org.openremote.model.rules.Users;import org.openremote.model.rules.flow.*;@@ -21,6 +22,7 @@ public class FlowRulesBuilder {private Assets assetsFacade;private Users usersFacade;private Notifications notificationFacade;+ private PredictedDatapoints predictedDatapointsFacade;private TimerService timerService;@@ -29,12 +31,14 @@ public class FlowRulesBuilder {AssetStorageService assetStorageService,Assets assetsFacade,Users usersFacade,- NotificationsFacade notificationFacade) {+ Notifications notificationFacade,+ PredictedDatapoints predictedDatapointsFacade) {this.timerService = timerService;this.assetStorageService = assetStorageService;this.assetsFacade = assetsFacade;this.usersFacade = usersFacade;this.notificationFacade = notificationFacade;+ this.predictedDatapointsFacade = predictedDatapointsFacade;}public void add(NodeCollection nodeCollection) {@@ -60,7 +64,7 @@ public class FlowRulesBuilder {}private Rule createRule(String name, NodeCollection collection, Node outputNode) throws Exception {- Object implementationResult = NodeModel.getImplementationFor(outputNode.getName()).execute(new NodeExecutionRequestInfo(collection, outputNode, null, null, assetsFacade, usersFacade, notificationFacade));+ Object implementationResult = NodeModel.getImplementationFor(outputNode.getName()).execute(new NodeExecutionRequestInfo(collection, outputNode, null, null, assetsFacade, usersFacade, notificationFacade, predictedDatapointsFacade));if (implementationResult == null)throw new NullPointerException(outputNode.getName() + " node returns null");diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.javaindex 5df0e8e20..ff4aae0c3 100644--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java@@ -24,7 +24,6 @@ import org.openremote.container.persistence.PersistenceEvent;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.concurrent.ManagerExecutorService;-import org.openremote.manager.rules.facade.NotificationsFacade;import org.openremote.model.asset.Asset;import org.openremote.model.attribute.AttributeRef;import org.openremote.model.notification.EmailNotificationMessage;@@ -33,10 +32,7 @@ import org.openremote.model.query.AssetQuery;import org.openremote.model.query.LogicGroup;import org.openremote.model.query.UserQuery;import org.openremote.model.query.filter.AttributePredicate;-import org.openremote.model.rules.AssetState;-import org.openremote.model.rules.Assets;-import org.openremote.model.rules.Ruleset;-import org.openremote.model.rules.Users;+import org.openremote.model.rules.*;import org.openremote.model.rules.json.*;import org.openremote.model.util.TextUtil;import org.openremote.model.util.TimeUtil;@@ -482,19 +478,21 @@ public class JsonRulesBuilder extends RulesBuilder {final protected TimerService timerService;final protected Assets assetsFacade;final protected Users usersFacade;- final protected NotificationsFacade<?> notificationsFacade;+ final protected Notifications notificationsFacade;+ final protected PredictedDatapoints predictedDatapointsFacade;final protected ManagerExecutorService executorService;final protected BiConsumer<Runnable, Long> scheduledActionConsumer;final protected Map<String, RuleState> ruleStateMap = new HashMap<>();final protected JsonRule[] jsonRules;- public JsonRulesBuilder(Ruleset ruleset, TimerService timerService, AssetStorageService assetStorageService, ManagerExecutorService executorService, Assets assetsFacade, Users usersFacade, NotificationsFacade<?> notificationsFacade, BiConsumer<Runnable, Long> scheduledActionConsumer) throws Exception {+ public JsonRulesBuilder(Ruleset ruleset, TimerService timerService, AssetStorageService assetStorageService, ManagerExecutorService executorService, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, PredictedDatapoints predictedDatapoints, BiConsumer<Runnable, Long> scheduledActionConsumer) throws Exception {this.timerService = timerService;this.assetStorageService = assetStorageService;this.executorService = executorService;this.assetsFacade = assetsFacade;this.usersFacade = usersFacade;this.notificationsFacade = notificationsFacade;+ this.predictedDatapointsFacade = predictedDatapoints;this.scheduledActionConsumer = scheduledActionConsumer;String rulesStr = ruleset.getRules();@@ -516,12 +514,12 @@ public class JsonRulesBuilder extends RulesBuilder {public void stop(RulesFacts facts) {Arrays.stream(jsonRules).forEach(jsonRule ->- executeRuleActions(jsonRule, jsonRule.onStop, "onStop", false, facts, null, assetsFacade, usersFacade, notificationsFacade, this.scheduledActionConsumer));+ executeRuleActions(jsonRule, jsonRule.onStop, "onStop", false, facts, null, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade, this.scheduledActionConsumer));}public void start(RulesFacts facts) {Arrays.stream(jsonRules).forEach(jsonRule ->- executeRuleActions(jsonRule, jsonRule.onStart, "onStart", false, facts, null, assetsFacade, usersFacade, notificationsFacade, this.scheduledActionConsumer));+ executeRuleActions(jsonRule, jsonRule.onStart, "onStart", false, facts, null, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade, this.scheduledActionConsumer));// Initialise asset statesonAssetStatesChanged(facts, null);@@ -611,12 +609,12 @@ public class JsonRulesBuilder extends RulesBuilder {try {if (ruleState.thenMatched()) {log(Level.FINER, "Triggered rule so executing 'then' actions for rule: " + rule.name);- executeRuleActions(rule, rule.then, "then", false, facts, ruleState, assetsFacade, usersFacade, notificationsFacade, scheduledActionConsumer);+ executeRuleActions(rule, rule.then, "then", false, facts, ruleState, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade, scheduledActionConsumer);}if (rule.otherwise != null && ruleState.otherwiseMatched()) {log(Level.FINER, "Triggered rule so executing 'otherwise' actions for rule: " + rule.name);- executeRuleActions(rule, rule.otherwise, "otherwise", true, facts, ruleState, assetsFacade, usersFacade, notificationsFacade, scheduledActionConsumer);+ executeRuleActions(rule, rule.otherwise, "otherwise", true, facts, ruleState, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade, scheduledActionConsumer);}} catch (Exception e) {log(Level.SEVERE, "Exception thrown during rule RHS execution", e);@@ -658,26 +656,27 @@ public class JsonRulesBuilder extends RulesBuilder {};}- public static void executeRuleActions(JsonRule rule, RuleAction[] ruleActions, String actionsName, boolean useUnmatched, RulesFacts facts, RuleState ruleState, Assets assetsFacade, Users usersFacade, NotificationsFacade<?> notificationsFacade, BiConsumer<Runnable, Long> scheduledActionConsumer) {+ public static void executeRuleActions(JsonRule rule, RuleAction[] ruleActions, String actionsName, boolean useUnmatched, RulesFacts facts, RuleState ruleState, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, PredictedDatapoints predictedDatapointsFacade, BiConsumer<Runnable, Long> scheduledActionConsumer) {if (ruleActions != null && ruleActions.length > 0) {long delay = 0L;- for (int i=0; i<ruleActions.length; i++) {+ for (int i = 0; i < ruleActions.length; i++) {RuleAction ruleAction = ruleActions[i];JsonRulesBuilder.RuleActionExecution actionExecution = buildRuleActionExecution(- rule,- ruleAction,- actionsName,- i,- useUnmatched,- facts,- ruleState,- assetsFacade,- usersFacade,- notificationsFacade+ rule,+ ruleAction,+ actionsName,+ i,+ useUnmatched,+ facts,+ ruleState,+ assetsFacade,+ usersFacade,+ notificationsFacade,+ predictedDatapointsFacade);if (actionExecution != null) {@@ -704,7 +703,7 @@ public class JsonRulesBuilder extends RulesBuilder {.collect(Collectors.toList());}- protected static RuleActionExecution buildRuleActionExecution(JsonRule rule, RuleAction ruleAction, String actionsName, int index, boolean useUnmatched, RulesFacts facts, RuleState ruleState, Assets assetsFacade, Users usersFacade, NotificationsFacade<?> notificationsFacade) {+ protected static RuleActionExecution buildRuleActionExecution(JsonRule rule, RuleAction ruleAction, String actionsName, int index, boolean useUnmatched, RulesFacts facts, RuleState ruleState, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, PredictedDatapoints predictedDatapointsFacade) {if (ruleAction instanceof RuleActionNotification) {RuleActionNotification notificationAction = (RuleActionNotification) ruleAction;diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.javaindex 3e866f622..33df29d8d 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java@@ -28,8 +28,10 @@ import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.concurrent.ManagerExecutorService;import org.openremote.manager.event.ClientEventService;import org.openremote.manager.notification.NotificationService;+import org.openremote.manager.predicted.AssetPredictedDatapointService;import org.openremote.manager.rules.facade.AssetsFacade;import org.openremote.manager.rules.facade.NotificationsFacade;+import org.openremote.manager.rules.facade.PredictedFacade;import org.openremote.manager.rules.facade.UsersFacade;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.model.asset.Asset;@@ -111,7 +113,8 @@ public class RulesEngine<T extends Ruleset> {final protected RulesEngineId<T> id;final protected Assets assetsFacade;final protected Users usersFacade;- final protected NotificationsFacade<T> notificationFacade;+ final protected Notifications notificationFacade;+ final protected PredictedDatapoints predictedFacade;final protected AssetLocationPredicateProcessor assetLocationPredicatesConsumer;final protected Map<Long, RulesetDeployment> deployments = new LinkedHashMap<>();@@ -139,6 +142,7 @@ public class RulesEngine<T extends Ruleset> {AssetProcessingService assetProcessingService,NotificationService notificationService,ClientEventService clientEventService,+ AssetPredictedDatapointService assetPredictedDatapointService,RulesEngineId<T> id,AssetLocationPredicateProcessor assetLocationPredicatesConsumer) {this.timerService = timerService;@@ -150,6 +154,7 @@ public class RulesEngine<T extends Ruleset> {this.assetsFacade = assetsFacade;this.usersFacade = new UsersFacade<>(id, assetStorageService, notificationService, identityService);this.notificationFacade = new NotificationsFacade<>(id, notificationService);+ this.predictedFacade = new PredictedFacade<>(id, assetPredictedDatapointService);this.assetLocationPredicatesConsumer = assetLocationPredicatesConsumer;this.facts = new RulesFacts(timerService, assetStorageService, assetsFacade, this, RULES_LOG);@@ -233,7 +238,7 @@ public class RulesEngine<T extends Ruleset> {removeRuleset(deployment.ruleset);}- deployment = new RulesetDeployment(ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationFacade);+ deployment = new RulesetDeployment(ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationFacade, predictedFacade);boolean compiled;if (TextUtil.isNullOrEmpty(ruleset.getRules())) {diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex 7a2e1019d..82f406fa7 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -33,6 +33,7 @@ import org.openremote.manager.asset.AssetUpdateProcessor;import org.openremote.manager.concurrent.ManagerExecutorService;import org.openremote.manager.event.ClientEventService;import org.openremote.manager.notification.NotificationService;+import org.openremote.manager.predicted.AssetPredictedDatapointService;import org.openremote.manager.rules.flow.FlowResourceImpl;import org.openremote.manager.rules.geofence.GeofenceAssetAdapter;import org.openremote.manager.security.ManagerIdentityService;@@ -110,6 +111,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asseprotected AssetStorageService assetStorageService;protected NotificationService notificationService;protected AssetProcessingService assetProcessingService;+ protected AssetPredictedDatapointService assetPredictedDatapointService;protected ClientEventService clientEventService;protected RulesEngine<GlobalRuleset> globalEngine;protected Tenant[] tenants;@@ -137,6 +139,7 @@ public class RulesService extends RouteBuilder implements ContainerService, AssenotificationService = container.getService(NotificationService.class);assetStorageService = container.getService(AssetStorageService.class);assetProcessingService = container.getService(AssetProcessingService.class);+ assetPredictedDatapointService = container.getService(AssetPredictedDatapointService.class);clientEventService = container.getService(ClientEventService.class);clientEventService.addSubscriptionAuthorizer((auth, subscription) -> {@@ -559,6 +562,7 @@ public class RulesService extends RouteBuilder implements ContainerService, AsseassetProcessingService,notificationService,clientEventService,+ assetPredictedDatapointService,new RulesEngineId<>(),locationPredicateRulesConsumer);@@ -598,6 +602,7 @@ public class RulesService extends RouteBuilder implements ContainerService, AsseassetProcessingService,notificationService,clientEventService,+ assetPredictedDatapointService,new RulesEngineId<>(realm),locationPredicateRulesConsumer));@@ -664,6 +669,7 @@ public class RulesService extends RouteBuilder implements ContainerService, AsseassetProcessingService,notificationService,clientEventService,+ assetPredictedDatapointService,new RulesEngineId<>(ruleset.getRealm(), assetId),locationPredicateRulesConsumer));@@ -955,4 +961,4 @@ public class RulesService extends RouteBuilder implements ContainerService, Assepublic String toString() {return getClass().getSimpleName() + "{}";}-}\ No newline at end of file+}diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.javaindex c5aa717f3..80b2bfa22 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java@@ -37,10 +37,8 @@ import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.concurrent.ManagerExecutorService;import org.openremote.manager.rules.facade.NotificationsFacade;import org.openremote.model.calendar.CalendarEvent;-import org.openremote.model.rules.Assets;-import org.openremote.model.rules.Ruleset;-import org.openremote.model.rules.RulesetStatus;-import org.openremote.model.rules.Users;+import org.openremote.model.notification.Notification;+import org.openremote.model.rules.*;import org.openremote.model.rules.flow.NodeCollection;import org.openremote.model.util.Pair;@@ -131,7 +129,8 @@ public class RulesetDeployment {final protected ManagerExecutorService executorService;final protected Assets assetsFacade;final protected Users usersFacade;- final protected NotificationsFacade<?> notificationsFacade;+ final protected Notifications notificationsFacade;+ final protected PredictedDatapoints predictedDatapointsFacade;final protected List<ScheduledFuture<?>> scheduledRuleActions = new ArrayList<>();protected RulesetStatus status = RulesetStatus.READY;protected Throwable error;@@ -140,7 +139,7 @@ public class RulesetDeployment {protected CalendarEvent validity;protected Pair<Long, Long> nextValidity;- public RulesetDeployment(Ruleset ruleset, TimerService timerService, AssetStorageService assetStorageService, ManagerExecutorService executorService, Assets assetsFacade, Users usersFacade, NotificationsFacade<?> notificationsFacade) {+ public RulesetDeployment(Ruleset ruleset, TimerService timerService, AssetStorageService assetStorageService, ManagerExecutorService executorService, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, PredictedDatapoints predictedDatapointsFacade) {this.ruleset = ruleset;this.timerService = timerService;this.assetStorageService = assetStorageService;@@ -148,6 +147,7 @@ public class RulesetDeployment {this.assetsFacade = assetsFacade;this.usersFacade = usersFacade;this.notificationsFacade = notificationsFacade;+ this.predictedDatapointsFacade = predictedDatapointsFacade;if (ruleset.hasMeta(Ruleset.META_KEY_VALIDITY)) {validity = ruleset.getValidity();@@ -209,13 +209,13 @@ public class RulesetDeployment {switch (ruleset.getLang()) {case JAVASCRIPT:- return compileRulesJavascript(ruleset, assetsFacade, usersFacade, notificationsFacade);+ return compileRulesJavascript(ruleset, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade);case GROOVY:- return compileRulesGroovy(ruleset, assetsFacade, usersFacade, notificationsFacade);+ return compileRulesGroovy(ruleset, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade);case JSON:return compileRulesJson(ruleset);case FLOW:- return compileRulesFlow(ruleset, assetsFacade,usersFacade,notificationsFacade);+ return compileRulesFlow(ruleset, assetsFacade,usersFacade,notificationsFacade, predictedDatapointsFacade);}return false;}@@ -264,7 +264,7 @@ public class RulesetDeployment {protected boolean compileRulesJson(Ruleset ruleset) {try {- jsonRulesBuilder = new JsonRulesBuilder(ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationsFacade, this::scheduleRuleAction);+ jsonRulesBuilder = new JsonRulesBuilder(ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade, this::scheduleRuleAction);for (Rule rule : jsonRulesBuilder.build()) {RulesEngine.LOG.fine("Registering JSON rule: " + rule.getName());@@ -278,7 +278,7 @@ public class RulesetDeployment {}}- protected boolean compileRulesJavascript(Ruleset ruleset, Assets assetsFacade, Users usersFacade, NotificationsFacade<?> notificationsFacade) {+ protected boolean compileRulesJavascript(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, PredictedDatapoints predictedDatapointsFacade) {// TODO https://github.com/pfisterer/scripting-sandbox/blob/master/src/main/java/de/farberg/scripting/sandbox/ScriptingSandbox.javaScriptEngine scriptEngine = scriptEngineManager.getEngineByName("nashorn");ScriptContext newContext = new SimpleScriptContext();@@ -288,6 +288,7 @@ public class RulesetDeployment {engineScope.put("assets", assetsFacade);engineScope.put("users", usersFacade);engineScope.put("notifications", notificationsFacade);+ engineScope.put("predictedDatapoints", predictedDatapointsFacade);String script = ruleset.getRules();@@ -419,7 +420,7 @@ public class RulesetDeployment {}}- protected boolean compileRulesGroovy(Ruleset ruleset, Assets assetsFacade, Users usersFacade, NotificationsFacade<?> notificationFacade) {+ protected boolean compileRulesGroovy(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationFacade, PredictedDatapoints predictedDatapointsFacade) {try {// TODO Implement sandbox// new DenyAll().register();@@ -431,6 +432,7 @@ public class RulesetDeployment {binding.setVariable("assets", assetsFacade);binding.setVariable("users", usersFacade);binding.setVariable("notifications", notificationFacade);+ binding.setVariable("predictedDatapoints", predictedDatapointsFacade);script.setBinding(binding);script.run();for (Rule rule : rulesBuilder.build()) {@@ -446,9 +448,9 @@ public class RulesetDeployment {}}- protected boolean compileRulesFlow(Ruleset ruleset, Assets assetsFacade, Users usersFacade, NotificationsFacade<?> notificationsFacade) {+ protected boolean compileRulesFlow(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, PredictedDatapoints predictedDatapointsFacade) {try {- flowRulesBuilder = new FlowRulesBuilder(timerService, assetStorageService, assetsFacade, usersFacade, this.notificationsFacade);+ flowRulesBuilder = new FlowRulesBuilder(timerService, assetStorageService, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade);NodeCollection nodeCollection = Container.JSON.readValue(ruleset.getRules(), NodeCollection.class);flowRulesBuilder.add(nodeCollection);for (Rule rule : flowRulesBuilder.build()) {@@ -500,4 +502,4 @@ public class RulesetDeployment {", status=" + status +'}';}-}\ No newline at end of file+}diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/PredictedFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/PredictedFacade.javanew file mode 100644index 000000000..839e37daf--- /dev/null+++ b/manager/src/main/java/org/openremote/manager/rules/facade/PredictedFacade.java@@ -0,0 +1,49 @@+/*+ * Copyright 2017, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.manager.rules.facade;++import org.openremote.manager.predicted.AssetPredictedDatapointService;+import org.openremote.manager.rules.RulesEngineId;+import org.openremote.model.asset.AssetAttribute;+import org.openremote.model.datapoint.ValueDatapoint;+import org.openremote.model.rules.PredictedDatapoints;+import org.openremote.model.rules.Ruleset;++import java.util.Arrays;+import java.util.logging.Logger;+import java.util.stream.Stream;++public class PredictedFacade<T extends Ruleset> extends PredictedDatapoints {++ private static final Logger LOG = Logger.getLogger(AssetsFacade.class.getName());++ protected final RulesEngineId<T> rulesEngineId;+ protected final AssetPredictedDatapointService assetPredictedDatapointService;++ public PredictedFacade(RulesEngineId<T> rulesEngineId, AssetPredictedDatapointService assetPredictedDatapointService) {+ this.rulesEngineId = rulesEngineId;+ this.assetPredictedDatapointService = assetPredictedDatapointService;+ }++ @Override+ public Stream<ValueDatapoint> getValueDataPoints(AssetAttribute attribute, long fromTimestamp, long toTimestamp) {+ return Arrays.stream(assetPredictedDatapointService.getValueDatapoints(attribute, fromTimestamp, toTimestamp));+ }+}diff --git a/manager/src/main/java/org/openremote/manager/rules/flow/NodeExecutionRequestInfo.java b/manager/src/main/java/org/openremote/manager/rules/flow/NodeExecutionRequestInfo.javaindex ffcaa4347..108d0cd4f 100644--- a/manager/src/main/java/org/openremote/manager/rules/flow/NodeExecutionRequestInfo.java+++ b/manager/src/main/java/org/openremote/manager/rules/flow/NodeExecutionRequestInfo.java@@ -3,6 +3,7 @@ package org.openremote.manager.rules.flow;import org.openremote.manager.rules.RulesFacts;import org.openremote.model.rules.Assets;import org.openremote.model.rules.Notifications;+import org.openremote.model.rules.PredictedDatapoints;import org.openremote.model.rules.Users;import org.openremote.model.rules.flow.*;@@ -27,6 +28,7 @@ public class NodeExecutionRequestInfo {private Assets assets;private Users users;private Notifications notifications;+ private PredictedDatapoints predictedDatapoints;public NodeExecutionRequestInfo() {collection = new NodeCollection();@@ -40,9 +42,10 @@ public class NodeExecutionRequestInfo {assets = null;users = null;notifications = null;+ predictedDatapoints = null;}- public NodeExecutionRequestInfo(NodeCollection collection, int outputSocketIndex, NodeSocket outputSocket, Node node, NodeSocket[] inputs, NodeSocket[] outputs, NodeInternal[] internals, RulesFacts facts, Assets assets, Users users, Notifications notifications) {+ public NodeExecutionRequestInfo(NodeCollection collection, int outputSocketIndex, NodeSocket outputSocket, Node node, NodeSocket[] inputs, NodeSocket[] outputs, NodeInternal[] internals, RulesFacts facts, Assets assets, Users users, Notifications notifications, PredictedDatapoints predictedDatapoints) {this.collection = collection;this.outputSocketIndex = outputSocketIndex;this.outputSocket = outputSocket;@@ -54,9 +57,10 @@ public class NodeExecutionRequestInfo {this.assets = assets;this.users = users;this.notifications = notifications;+ this.predictedDatapoints = predictedDatapoints;}- public NodeExecutionRequestInfo(NodeCollection collection, Node node, NodeSocket socket, RulesFacts facts, Assets assets, Users users, Notifications notifications) {+ public NodeExecutionRequestInfo(NodeCollection collection, Node node, NodeSocket socket, RulesFacts facts, Assets assets, Users users, Notifications notifications, PredictedDatapoints predictedDatapoints) {if (socket != null && Arrays.stream(node.getOutputs()).noneMatch(c -> c.getNodeId().equals(node.getId())))throw new IllegalArgumentException("Given socket does not belong to given node");@@ -83,13 +87,14 @@ public class NodeExecutionRequestInfo {this.assets = assets;this.users = users;this.notifications = notifications;+ this.predictedDatapoints = predictedDatapoints;}public Object getValueFromInput(int index) {NodeSocket aSocket = getInputs()[index];Node aNode = getCollection().getNodeById(aSocket.getNodeId());return NodeModel.getImplementationFor(aNode.getName()).execute(- new NodeExecutionRequestInfo(getCollection(), aNode, aSocket, getFacts(), getAssets(), getUsers(), getNotifications())+ new NodeExecutionRequestInfo(getCollection(), aNode, aSocket, getFacts(), getAssets(), getUsers(), getNotifications(), getPredictedDatapoints()));}@@ -178,6 +183,14 @@ public class NodeExecutionRequestInfo {this.notifications = notifications;}+ public PredictedDatapoints getPredictedDatapoints() {+ return predictedDatapoints;+ }++ public void setPredictedDatapoints(PredictedDatapoints predictedDatapoints) {+ this.predictedDatapoints = predictedDatapoints;+ }+public RulesFacts getFacts() {return facts;}diff --git a/model/src/main/java/org/openremote/model/rules/Assets.java b/model/src/main/java/org/openremote/model/rules/Assets.javaindex 091fc83a1..8403a4e38 100644--- a/model/src/main/java/org/openremote/model/rules/Assets.java+++ b/model/src/main/java/org/openremote/model/rules/Assets.java@@ -20,12 +20,9 @@package org.openremote.model.rules;import org.openremote.model.asset.Asset;-import org.openremote.model.asset.AssetType;-import org.openremote.model.query.AssetQuery;import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.attribute.AttributeExecuteStatus;-import org.openremote.model.query.LogicGroup;-import org.openremote.model.query.filter.*;+import org.openremote.model.query.AssetQuery;import org.openremote.model.value.Value;import java.util.stream.Stream;diff --git a/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.java b/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.javanew file mode 100644index 000000000..6f04c2110--- /dev/null+++ b/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.java@@ -0,0 +1,32 @@+/*+ * Copyright 2017, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.model.rules;++import org.openremote.model.asset.AssetAttribute;+import org.openremote.model.datapoint.ValueDatapoint;++import java.util.stream.Stream;++public abstract class PredictedDatapoints {++ public abstract Stream<ValueDatapoint> getValueDataPoints(AssetAttribute attribute,+ long fromTimestamp,+ long toTimestamp);+}