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 HAS_PREDICTED_DATA_POINTS to MetaItemType Fixed a bug in AssetPredictedDatapointResource to get datapoints
Michael Rademaker29110718c250
diff --git a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.javaindex 287da16f0..b5d40f82f 100644--- a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java@@ -79,8 +79,8 @@ public class AssetPredictedDatapointResourceImpl extends ManagerWebResource implreturn assetPredictedDatapointService.getValueDatapoints(attribute.getReferenceOrThrow(),- toTimestamp,- fromTimestamp+ fromTimestamp,+ toTimestamp);} catch (IllegalStateException ex) {throw new WebApplicationException(ex, Response.Status.BAD_REQUEST);diff --git a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.javaindex ec17e0e28..94a5e5a49 100644--- a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java@@ -26,7 +26,6 @@ import org.openremote.container.ContainerService;import org.openremote.container.persistence.PersistenceService;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;-import org.openremote.manager.concurrent.ManagerExecutorService;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.manager.web.ManagerWebService;import org.openremote.model.attribute.AttributeRef;@@ -47,10 +46,8 @@ import java.util.logging.Logger;public class AssetPredictedDatapointService implements ContainerService {private static final Logger LOG = Logger.getLogger(AssetPredictedDatapointService.class.getName());+protected PersistenceService persistenceService;- protected AssetStorageService assetStorageService;- protected TimerService timerService;- protected ManagerExecutorService managerExecutorService;@Overridepublic int getPriority() {@@ -60,9 +57,6 @@ public class AssetPredictedDatapointService implements ContainerService {@Overridepublic void init(Container container) throws Exception {persistenceService = container.getService(PersistenceService.class);- assetStorageService = container.getService(AssetStorageService.class);- timerService = container.getService(TimerService.class);- managerExecutorService = container.getService(ManagerExecutorService.class);container.getService(ManagerWebService.class).getApiSingletons().add(new AssetPredictedDatapointResourceImpl(@@ -156,13 +150,11 @@ public class AssetPredictedDatapointService implements ContainerService {}public void updateValue(AttributeRef attributeRef, Value value, long timestamp) {- updateValue(attributeRef.getEntityId(), attributeRef.getAttributeName(), value, timestamp);+ persistenceService.doTransaction(em -> upsertValue(em, attributeRef.getEntityId(), attributeRef.getAttributeName(), value, timestamp));}public void updateValue(String assetId, String attributeName, Value value, long timestamp) {- persistenceService.doTransaction(em -> {- upsertValue(em, assetId, attributeName, value, timestamp);- });+ updateValue(new AttributeRef(assetId, attributeName), value, timestamp);}private void upsertValue(EntityManager entityManager, String assetId, String attributeName, Value value, long timestamp) {diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.javaindex 33df29d8d..c1ace56c7 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java@@ -49,6 +49,7 @@ import java.util.concurrent.TimeUnit;import java.util.function.BiConsumer;import java.util.logging.Level;import java.util.logging.Logger;+import java.util.stream.Collectors;import static org.openremote.container.concurrent.GlobalLock.withLock;import static org.openremote.model.rules.RulesetStatus.*;@@ -465,7 +466,7 @@ public class RulesEngine<T extends Ruleset> {});}- protected void fireAllDeployments() {+ private void fireDeployments(Collection<RulesetDeployment> deploymentList) {if (!running) {return;}@@ -481,7 +482,7 @@ public class RulesEngine<T extends Ruleset> {// Remove any expired temporary factsfacts.removeExpiredTemporaryFacts();- for (RulesetDeployment deployment : deployments.values()) {+ for (RulesetDeployment deployment : deploymentList) {try {if (deployment.getStatus() == DEPLOYED) {@@ -524,6 +525,14 @@ public class RulesEngine<T extends Ruleset> {trackLocationPredicates(false);}+ protected void fireAllDeployments() {+ fireDeployments(deployments.values());+ }++ protected void fireAllDeploymentsWithPredictedData() {+ fireDeployments(deployments.values().stream().filter(RulesetDeployment::isTriggerOnPredictedData).collect(Collectors.toList()));+ }+protected void notifyAssetStatesChanged(AssetStateChangeEvent event) {for (RulesetDeployment deployment : deployments.values()) {if (!deployment.isError()) {diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex 82f406fa7..7d218aaf3 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -41,13 +41,13 @@ import org.openremote.manager.web.ManagerWebService;import org.openremote.model.Constants;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetAttribute;-import org.openremote.model.attribute.MetaItemType;import org.openremote.model.attribute.AttributeEvent.Source;+import org.openremote.model.attribute.MetaItemType;import org.openremote.model.query.AssetQuery;import org.openremote.model.query.RulesetQuery;-import org.openremote.model.query.filter.MetaPredicate;import org.openremote.model.query.filter.BooleanPredicate;import org.openremote.model.query.filter.LocationAttributePredicate;+import org.openremote.model.query.filter.MetaPredicate;import org.openremote.model.rules.*;import org.openremote.model.rules.geofence.GeofenceDefinition;import org.openremote.model.security.ClientRole;@@ -57,7 +57,6 @@ import org.openremote.model.value.ObjectValue;import javax.persistence.EntityManager;import java.util.*;-import java.util.concurrent.atomic.AtomicBoolean;import java.util.function.BiFunction;import java.util.logging.Logger;import java.util.stream.Collectors;@@ -957,6 +956,17 @@ public class RulesService extends RouteBuilder implements ContainerService, Assereturn Optional.empty();}+ public void fireDeploymentsWithPredictedDataForAsset(String assetId) {+ List<AssetState> assetStates = getAssetStatesInScope(assetId);+ if (assetStates.size() > 0) {+ String realm = assetStates.get(0).getRealm();+ String[] assetPaths = assetStates.stream().flatMap(assetState -> Arrays.stream(assetState.getPath())).toArray(String[]::new);+ for (RulesEngine<?> rulesEngine : getEnginesInScope(realm, assetPaths)) {+ rulesEngine.fireAllDeploymentsWithPredictedData();+ }+ }+ }+@Overridepublic String toString() {return getClass().getSimpleName() + "{}";diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.javaindex 80b2bfa22..ea33c2aac 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java@@ -35,9 +35,7 @@ import org.openremote.container.Container;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.calendar.CalendarEvent;-import org.openremote.model.notification.Notification;import org.openremote.model.rules.*;import org.openremote.model.rules.flow.NodeCollection;import org.openremote.model.util.Pair;@@ -493,13 +491,17 @@ public class RulesetDeployment {return ruleset.isContinueOnError();}+ public boolean isTriggerOnPredictedData() {+ return ruleset.isTriggerOnPredictedData();+ }+@Overridepublic String toString() {return getClass().getSimpleName() + "{" +- "id=" + getId() +- ", name='" + getName() + '\'' +- ", version=" + getVersion() +- ", status=" + status +- '}';+ "id=" + getId() ++ ", name='" + getName() + '\'' ++ ", version=" + getVersion() ++ ", status=" + status ++ '}';}}diff --git a/model/src/main/java/org/openremote/model/attribute/MetaItemType.java b/model/src/main/java/org/openremote/model/attribute/MetaItemType.javaindex f564e6613..4e275d99d 100644--- a/model/src/main/java/org/openremote/model/attribute/MetaItemType.java+++ b/model/src/main/java/org/openremote/model/attribute/MetaItemType.java@@ -414,7 +414,19 @@ public enum MetaItemType implements MetaItemDescriptor {null,null,false- );+ ),++ /**+ * Could possible have predicted datapoints+ */+ HAS_PREDICTED_DATA_POINTS(+ ASSET_META_NAMESPACE + ":hasPredictedDatapoints",+ new Access(true, false, true),+ ValueType.BOOLEAN,+ null,+ null,+ Values.create(true),+ true);final protected String urn;final protected Access access;diff --git a/model/src/main/java/org/openremote/model/predicted/AssetPredictedDatapointResource.java b/model/src/main/java/org/openremote/model/predicted/AssetPredictedDatapointResource.javaindex 00f69a0de..b06deace5 100644--- a/model/src/main/java/org/openremote/model/predicted/AssetPredictedDatapointResource.java+++ b/model/src/main/java/org/openremote/model/predicted/AssetPredictedDatapointResource.java@@ -34,7 +34,7 @@ import static javax.ws.rs.core.MediaType.APPLICATION_JSON;@JsType(isNative = true)public interface AssetPredictedDatapointResource {/**- * Retrieve the historical datapoints of an asset attribute. Regular users can only access assets in their+ * Retrieve the predicted datapoints of an asset attribute. Regular users can only access assets in their* authenticated realm, the superuser can access assets in other (all) realms. A 403 status is returned if a* regular user tries to access an asset in a realm different than its authenticated realm, or if the user is* restricted and the asset is not linked to the user. A 400 status is returned if the asset attribute does@@ -50,6 +50,6 @@ public interface AssetPredictedDatapointResource {@PathParam("assetId") String assetId,@PathParam("attributeName") String attributeName,@QueryParam("fromTimestamp") long fromTimestamp,- @QueryParam("toTimeStamp") long toTimeStamp);+ @QueryParam("toTimestamp") long toTimestamp);}diff --git a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java b/model/src/main/java/org/openremote/model/rules/AssetRuleset.javaindex 0a0b2e93a..a5dfc19fd 100644--- a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/AssetRuleset.java@@ -172,6 +172,12 @@ public class AssetRuleset extends Ruleset {return this;}+ @Override+ public AssetRuleset setTriggerOnPredictedData(boolean triggerOnPredictedData) {+ super.setTriggerOnPredictedData(triggerOnPredictedData);+ return this;+ }+@Overridepublic String toString() {return getClass().getSimpleName() + "{" +diff --git a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.javaindex d5106e592..e98940fe6 100644--- a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java@@ -131,7 +131,13 @@ public class GlobalRuleset extends Ruleset {public GlobalRuleset setValidity(CalendarEvent calendarEvent) {super.setValidity(calendarEvent);return this;- }+ }++ @Override+ public GlobalRuleset setTriggerOnPredictedData(boolean triggerOnPredictedData) {+ super.setTriggerOnPredictedData(triggerOnPredictedData);+ return this;+ }@Overridepublic String toString() {diff --git a/model/src/main/java/org/openremote/model/rules/Ruleset.java b/model/src/main/java/org/openremote/model/rules/Ruleset.javaindex 8eb6fa3b3..a8ae17a7d 100644--- a/model/src/main/java/org/openremote/model/rules/Ruleset.java+++ b/model/src/main/java/org/openremote/model/rules/Ruleset.java@@ -201,6 +201,7 @@ public abstract class Ruleset {public static final String META_KEY_CONTINUE_ON_ERROR = "urn:openremote:rule:meta:continueOnError";public static final String META_KEY_VALIDITY = "urn:openremote:rule:meta:validity";+ public static final String META_KEY_TRIGGER_ON_PREDICTED_DATA = "urn:openremote:rule:meta:triggerOnPredictedData";protected Ruleset() {}@@ -373,4 +374,20 @@ public abstract class Ruleset {}return this;}++ public boolean isTriggerOnPredictedData() {+ return Values.getObject(meta).flatMap(objValue -> objValue.getBoolean(META_KEY_TRIGGER_ON_PREDICTED_DATA)).orElse(false);+ }++ public Ruleset setTriggerOnPredictedData(boolean triggerOnPredictedData) {+ if (meta == null) {+ meta = Values.createObject();+ }+ if (!triggerOnPredictedData) {+ meta.remove(META_KEY_TRIGGER_ON_PREDICTED_DATA);+ } else {+ meta.put(META_KEY_TRIGGER_ON_PREDICTED_DATA, true);+ }+ return this;+ }}diff --git a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java b/model/src/main/java/org/openremote/model/rules/TenantRuleset.javaindex 92c159a11..cfa3dc80a 100644--- a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/TenantRuleset.java@@ -157,7 +157,13 @@ public class TenantRuleset extends Ruleset {public TenantRuleset setValidity(CalendarEvent calendarEvent) {super.setValidity(calendarEvent);return this;- }+ }++ @Override+ public TenantRuleset setTriggerOnPredictedData(boolean triggerOnPredictedData) {+ super.setTriggerOnPredictedData(triggerOnPredictedData);+ return this;+ }@Overridepublic String toString() {