Skip to content

armgit / core

Public Imported from GitHub
0

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

Made it possible to use historic datapoint in rules

Michael Rademaker7fd398343036
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
index fbfb072a1..b1aa4ff39 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
@@ -32,7 +32,6 @@ import javax.persistence.TypedQuery;
import java.sql.*;
import java.time.Duration;
import java.time.Instant;
-import java.time.Period;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
@@ -158,14 +157,29 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
if (attributeRef != null) {
query
- .setParameter("assetId", attributeRef.getEntityId())
- .setParameter("attributeName", attributeRef.getAttributeName());
+ .setParameter("assetId", attributeRef.getEntityId())
+ .setParameter("attributeName", attributeRef.getAttributeName());
}
return query.getSingleResult();
});
}
+ public ValueDatapoint[] getValueDatapoints(AttributeRef attributeRef,
+ DatapointInterval datapointInterval,
+ long fromTimestamp,
+ long toTimestamp) {
+
+ Asset asset = assetStorageService.find(attributeRef.getEntityId());
+ if (asset == null) {
+ throw new IllegalStateException("Asset not found: " + attributeRef.getEntityId());
+ }
+ AssetAttribute assetAttribute = asset.getAttribute(attributeRef.getAttributeName())
+ .orElseThrow(() -> new IllegalStateException("Attribute not found: " + attributeRef.getAttributeName()));
+
+ return getValueDatapoints(assetAttribute, datapointInterval, fromTimestamp, toTimestamp);
+ }
+
public ValueDatapoint[] getValueDatapoints(AssetAttribute attribute,
DatapointInterval datapointInterval,
long fromTimestamp,
diff --git a/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.java
index 1a36a9244..430d68ab6 100644
--- a/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/FlowRulesBuilder.java
@@ -6,10 +6,7 @@ import org.openremote.container.timer.TimerService;
import org.openremote.manager.asset.AssetStorageService;
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.*;
import org.openremote.model.rules.flow.*;
import java.util.*;
@@ -22,6 +19,7 @@ public class FlowRulesBuilder {
private Assets assetsFacade;
private Users usersFacade;
private Notifications notificationFacade;
+ private HistoricDatapoints historicDatapointsFacade;
private PredictedDatapoints predictedDatapointsFacade;
private TimerService timerService;
@@ -32,12 +30,14 @@ public class FlowRulesBuilder {
Assets assetsFacade,
Users usersFacade,
Notifications notificationFacade,
+ HistoricDatapoints historicDatapointsFacade,
PredictedDatapoints predictedDatapointsFacade) {
this.timerService = timerService;
this.assetStorageService = assetStorageService;
this.assetsFacade = assetsFacade;
this.usersFacade = usersFacade;
this.notificationFacade = notificationFacade;
+ this.historicDatapointsFacade = historicDatapointsFacade;
this.predictedDatapointsFacade = predictedDatapointsFacade;
}
@@ -64,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, predictedDatapointsFacade));
+ Object implementationResult = NodeModel.getImplementationFor(outputNode.getName()).execute(new NodeExecutionRequestInfo(collection, outputNode, null, null, assetsFacade, usersFacade, notificationFacade, historicDatapointsFacade, 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.java
index ff4aae0c3..ebd79f11d 100644
--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
@@ -479,19 +479,25 @@ public class JsonRulesBuilder extends RulesBuilder {
final protected Assets assetsFacade;
final protected Users usersFacade;
final protected Notifications notificationsFacade;
+ final protected HistoricDatapoints historicDatapointsFacade;
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, Notifications notificationsFacade, PredictedDatapoints predictedDatapoints, BiConsumer<Runnable, Long> scheduledActionConsumer) throws Exception {
+ public JsonRulesBuilder(Ruleset ruleset, TimerService timerService,
+ AssetStorageService assetStorageService, ManagerExecutorService executorService,
+ Assets assetsFacade, Users usersFacade, Notifications notificationsFacade,
+ HistoricDatapoints historicDatapoints, 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.historicDatapointsFacade= historicDatapoints;
this.predictedDatapointsFacade = predictedDatapoints;
this.scheduledActionConsumer = scheduledActionConsumer;
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
index c1ace56c7..9d87d0664 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
@@ -26,13 +26,11 @@ import org.openremote.container.timer.TimerService;
import org.openremote.manager.asset.AssetProcessingService;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.concurrent.ManagerExecutorService;
+import org.openremote.manager.datapoint.AssetDatapointService;
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.rules.facade.*;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.model.asset.Asset;
import org.openremote.model.attribute.AttributeType;
@@ -116,6 +114,7 @@ public class RulesEngine<T extends Ruleset> {
final protected Users usersFacade;
final protected Notifications notificationFacade;
final protected PredictedDatapoints predictedFacade;
+ final protected HistoricDatapoints historicFacade;
final protected AssetLocationPredicateProcessor assetLocationPredicatesConsumer;
final protected Map<Long, RulesetDeployment> deployments = new LinkedHashMap<>();
@@ -143,6 +142,7 @@ public class RulesEngine<T extends Ruleset> {
AssetProcessingService assetProcessingService,
NotificationService notificationService,
ClientEventService clientEventService,
+ AssetDatapointService assetDatapointService,
AssetPredictedDatapointService assetPredictedDatapointService,
RulesEngineId<T> id,
AssetLocationPredicateProcessor assetLocationPredicatesConsumer) {
@@ -155,6 +155,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.historicFacade = new HistoricFacade<>(id, assetDatapointService);
this.predictedFacade = new PredictedFacade<>(id, assetPredictedDatapointService);
this.assetLocationPredicatesConsumer = assetLocationPredicatesConsumer;
@@ -239,7 +240,7 @@ public class RulesEngine<T extends Ruleset> {
removeRuleset(deployment.ruleset);
}
- deployment = new RulesetDeployment(ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationFacade, predictedFacade);
+ deployment = new RulesetDeployment(ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationFacade, historicFacade, 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.java
index 7d218aaf3..b7b7a1203 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
@@ -31,6 +31,7 @@ import org.openremote.manager.asset.AssetProcessingService;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.asset.AssetUpdateProcessor;
import org.openremote.manager.concurrent.ManagerExecutorService;
+import org.openremote.manager.datapoint.AssetDatapointService;
import org.openremote.manager.event.ClientEventService;
import org.openremote.manager.notification.NotificationService;
import org.openremote.manager.predicted.AssetPredictedDatapointService;
@@ -110,6 +111,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
protected AssetStorageService assetStorageService;
protected NotificationService notificationService;
protected AssetProcessingService assetProcessingService;
+ protected AssetDatapointService assetDatapointService;
protected AssetPredictedDatapointService assetPredictedDatapointService;
protected ClientEventService clientEventService;
protected RulesEngine<GlobalRuleset> globalEngine;
@@ -138,6 +140,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
notificationService = container.getService(NotificationService.class);
assetStorageService = container.getService(AssetStorageService.class);
assetProcessingService = container.getService(AssetProcessingService.class);
+ assetDatapointService = container.getService(AssetDatapointService.class);
assetPredictedDatapointService = container.getService(AssetPredictedDatapointService.class);
clientEventService = container.getService(ClientEventService.class);
@@ -561,6 +564,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
assetProcessingService,
notificationService,
clientEventService,
+ assetDatapointService,
assetPredictedDatapointService,
new RulesEngineId<>(),
locationPredicateRulesConsumer
@@ -601,6 +605,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
assetProcessingService,
notificationService,
clientEventService,
+ assetDatapointService,
assetPredictedDatapointService,
new RulesEngineId<>(realm),
locationPredicateRulesConsumer
@@ -668,6 +673,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
assetProcessingService,
notificationService,
clientEventService,
+ assetDatapointService,
assetPredictedDatapointService,
new RulesEngineId<>(ruleset.getRealm(), assetId),
locationPredicateRulesConsumer
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
index ea33c2aac..6e6cbfdd1 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
@@ -128,6 +128,7 @@ public class RulesetDeployment {
final protected Assets assetsFacade;
final protected Users usersFacade;
final protected Notifications notificationsFacade;
+ final protected HistoricDatapoints historicDatapointsFacade;
final protected PredictedDatapoints predictedDatapointsFacade;
final protected List<ScheduledFuture<?>> scheduledRuleActions = new ArrayList<>();
protected RulesetStatus status = RulesetStatus.READY;
@@ -137,7 +138,10 @@ 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, Notifications notificationsFacade, PredictedDatapoints predictedDatapointsFacade) {
+ public RulesetDeployment(Ruleset ruleset, TimerService timerService,
+ AssetStorageService assetStorageService, ManagerExecutorService executorService,
+ Assets assetsFacade, Users usersFacade, Notifications notificationsFacade,
+ HistoricDatapoints historicDatapointsFacade, PredictedDatapoints predictedDatapointsFacade) {
this.ruleset = ruleset;
this.timerService = timerService;
this.assetStorageService = assetStorageService;
@@ -145,6 +149,7 @@ public class RulesetDeployment {
this.assetsFacade = assetsFacade;
this.usersFacade = usersFacade;
this.notificationsFacade = notificationsFacade;
+ this.historicDatapointsFacade = historicDatapointsFacade;
this.predictedDatapointsFacade = predictedDatapointsFacade;
if (ruleset.hasMeta(Ruleset.META_KEY_VALIDITY)) {
@@ -207,13 +212,13 @@ public class RulesetDeployment {
switch (ruleset.getLang()) {
case JAVASCRIPT:
- return compileRulesJavascript(ruleset, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade);
+ return compileRulesJavascript(ruleset, assetsFacade, usersFacade, notificationsFacade, historicDatapointsFacade, predictedDatapointsFacade);
case GROOVY:
- return compileRulesGroovy(ruleset, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade);
+ return compileRulesGroovy(ruleset, assetsFacade, usersFacade, notificationsFacade, historicDatapointsFacade, predictedDatapointsFacade);
case JSON:
return compileRulesJson(ruleset);
case FLOW:
- return compileRulesFlow(ruleset, assetsFacade,usersFacade,notificationsFacade, predictedDatapointsFacade);
+ return compileRulesFlow(ruleset, assetsFacade, usersFacade, notificationsFacade, historicDatapointsFacade, predictedDatapointsFacade);
}
return false;
}
@@ -262,7 +267,7 @@ public class RulesetDeployment {
protected boolean compileRulesJson(Ruleset ruleset) {
try {
- jsonRulesBuilder = new JsonRulesBuilder(ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade, this::scheduleRuleAction);
+ jsonRulesBuilder = new JsonRulesBuilder(ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationsFacade, historicDatapointsFacade, predictedDatapointsFacade, this::scheduleRuleAction);
for (Rule rule : jsonRulesBuilder.build()) {
RulesEngine.LOG.fine("Registering JSON rule: " + rule.getName());
@@ -276,7 +281,7 @@ public class RulesetDeployment {
}
}
- protected boolean compileRulesJavascript(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, PredictedDatapoints predictedDatapointsFacade) {
+ protected boolean compileRulesJavascript(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, HistoricDatapoints historicDatapointsFacade, PredictedDatapoints predictedDatapointsFacade) {
// TODO https://github.com/pfisterer/scripting-sandbox/blob/master/src/main/java/de/farberg/scripting/sandbox/ScriptingSandbox.java
ScriptEngine scriptEngine = scriptEngineManager.getEngineByName("nashorn");
ScriptContext newContext = new SimpleScriptContext();
@@ -286,6 +291,7 @@ public class RulesetDeployment {
engineScope.put("assets", assetsFacade);
engineScope.put("users", usersFacade);
engineScope.put("notifications", notificationsFacade);
+ engineScope.put("historicDatapoints", historicDatapointsFacade);
engineScope.put("predictedDatapoints", predictedDatapointsFacade);
String script = ruleset.getRules();
@@ -418,7 +424,7 @@ public class RulesetDeployment {
}
}
- protected boolean compileRulesGroovy(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationFacade, PredictedDatapoints predictedDatapointsFacade) {
+ protected boolean compileRulesGroovy(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationFacade, HistoricDatapoints historicDatapointsFacade, PredictedDatapoints predictedDatapointsFacade) {
try {
// TODO Implement sandbox
// new DenyAll().register();
@@ -430,6 +436,7 @@ public class RulesetDeployment {
binding.setVariable("assets", assetsFacade);
binding.setVariable("users", usersFacade);
binding.setVariable("notifications", notificationFacade);
+ binding.setVariable("historicDatapoints", historicDatapointsFacade);
binding.setVariable("predictedDatapoints", predictedDatapointsFacade);
script.setBinding(binding);
script.run();
@@ -446,9 +453,9 @@ public class RulesetDeployment {
}
}
- protected boolean compileRulesFlow(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, PredictedDatapoints predictedDatapointsFacade) {
+ protected boolean compileRulesFlow(Ruleset ruleset, Assets assetsFacade, Users usersFacade, Notifications notificationsFacade, HistoricDatapoints historicDatapointsFacade, PredictedDatapoints predictedDatapointsFacade) {
try {
- flowRulesBuilder = new FlowRulesBuilder(timerService, assetStorageService, assetsFacade, usersFacade, notificationsFacade, predictedDatapointsFacade);
+ flowRulesBuilder = new FlowRulesBuilder(timerService, assetStorageService, assetsFacade, usersFacade, notificationsFacade, historicDatapointsFacade, predictedDatapointsFacade);
NodeCollection nodeCollection = Container.JSON.readValue(ruleset.getRules(), NodeCollection.class);
flowRulesBuilder.add(nodeCollection);
for (Rule rule : flowRulesBuilder.build()) {
diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/HistoricFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/HistoricFacade.java
new file mode 100644
index 000000000..d444967ea
--- /dev/null
+++ b/manager/src/main/java/org/openremote/manager/rules/facade/HistoricFacade.java
@@ -0,0 +1,50 @@
+/*
+ * 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.datapoint.AssetDatapointService;
+import org.openremote.manager.predicted.AssetPredictedDatapointService;
+import org.openremote.manager.rules.RulesEngineId;
+import org.openremote.model.attribute.AttributeRef;
+import org.openremote.model.datapoint.AssetDatapoint;
+import org.openremote.model.datapoint.DatapointInterval;
+import org.openremote.model.datapoint.ValueDatapoint;
+import org.openremote.model.rules.HistoricDatapoints;
+import org.openremote.model.rules.PredictedDatapoints;
+import org.openremote.model.rules.Ruleset;
+
+import java.util.logging.Logger;
+
+public class HistoricFacade<T extends Ruleset> extends HistoricDatapoints {
+ private static final Logger LOG = Logger.getLogger(HistoricFacade.class.getName());
+
+ protected final RulesEngineId<T> rulesEngineId;
+ protected final AssetDatapointService assetDatapointService;
+
+ public HistoricFacade(RulesEngineId<T> rulesEngineId, AssetDatapointService assetDatapointService) {
+ this.rulesEngineId = rulesEngineId;
+ this.assetDatapointService = assetDatapointService;
+ }
+
+ @Override
+ public ValueDatapoint[] getValueDataPoints(AttributeRef attributeRef, DatapointInterval interval, long fromTimestamp, long toTimestamp) {
+ return assetDatapointService.getValueDatapoints(attributeRef, interval, fromTimestamp, toTimestamp);
+ }
+}
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.java
index 89c756004..1056cdc86 100644
--- a/manager/src/main/java/org/openremote/manager/rules/facade/PredictedFacade.java
+++ b/manager/src/main/java/org/openremote/manager/rules/facade/PredictedFacade.java
@@ -32,7 +32,7 @@ import java.util.logging.Logger;
public class PredictedFacade<T extends Ruleset> extends PredictedDatapoints {
- private static final Logger LOG = Logger.getLogger(AssetsFacade.class.getName());
+ private static final Logger LOG = Logger.getLogger(PredictedFacade.class.getName());
protected final RulesEngineId<T> rulesEngineId;
protected final AssetPredictedDatapointService assetPredictedDatapointService;
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.java
index 108d0cd4f..b861d6674 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
@@ -1,10 +1,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.*;
import org.openremote.model.rules.flow.*;
import java.util.ArrayList;
@@ -28,6 +25,7 @@ public class NodeExecutionRequestInfo {
private Assets assets;
private Users users;
private Notifications notifications;
+ private HistoricDatapoints historicDatapoints;
private PredictedDatapoints predictedDatapoints;
public NodeExecutionRequestInfo() {
@@ -42,10 +40,14 @@ public class NodeExecutionRequestInfo {
assets = null;
users = null;
notifications = null;
+ historicDatapoints = 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, PredictedDatapoints predictedDatapoints) {
+ public NodeExecutionRequestInfo(NodeCollection collection, int outputSocketIndex, NodeSocket outputSocket,
+ Node node, NodeSocket[] inputs, NodeSocket[] outputs, NodeInternal[] internals,
+ RulesFacts facts, Assets assets, Users users, Notifications notifications,
+ HistoricDatapoints historicDatapoints, PredictedDatapoints predictedDatapoints) {
this.collection = collection;
this.outputSocketIndex = outputSocketIndex;
this.outputSocket = outputSocket;
@@ -57,10 +59,13 @@ public class NodeExecutionRequestInfo {
this.assets = assets;
this.users = users;
this.notifications = notifications;
+ this.historicDatapoints = historicDatapoints;
this.predictedDatapoints = predictedDatapoints;
}
- public NodeExecutionRequestInfo(NodeCollection collection, Node node, NodeSocket socket, RulesFacts facts, Assets assets, Users users, Notifications notifications, PredictedDatapoints predictedDatapoints) {
+ public NodeExecutionRequestInfo(NodeCollection collection, Node node, NodeSocket socket, RulesFacts facts,
+ Assets assets, Users users, Notifications notifications,
+ HistoricDatapoints historicDatapoints, 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");
@@ -87,6 +92,7 @@ public class NodeExecutionRequestInfo {
this.assets = assets;
this.users = users;
this.notifications = notifications;
+ this.historicDatapoints = historicDatapoints;
this.predictedDatapoints = predictedDatapoints;
}
@@ -94,7 +100,7 @@ public class NodeExecutionRequestInfo {
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(), getPredictedDatapoints())
+ new NodeExecutionRequestInfo(getCollection(), aNode, aSocket, getFacts(), getAssets(), getUsers(), getNotifications(), getHistoricDatapoints(), getPredictedDatapoints())
);
}
@@ -183,6 +189,10 @@ public class NodeExecutionRequestInfo {
this.notifications = notifications;
}
+ public HistoricDatapoints getHistoricDatapoints() {
+ return historicDatapoints;
+ }
+
public PredictedDatapoints getPredictedDatapoints() {
return predictedDatapoints;
}
diff --git a/model/src/main/java/org/openremote/model/rules/HistoricDatapoints.java b/model/src/main/java/org/openremote/model/rules/HistoricDatapoints.java
new file mode 100644
index 000000000..acf1e109e
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/rules/HistoricDatapoints.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.attribute.AttributeRef;
+import org.openremote.model.datapoint.DatapointInterval;
+import org.openremote.model.datapoint.ValueDatapoint;
+
+public abstract class HistoricDatapoints {
+
+ public abstract ValueDatapoint[] getValueDataPoints(AttributeRef attributeRef,
+ DatapointInterval interval,
+ long fromTimestamp,
+ long toTimestamp);
+}