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 function to AssetPredictedDatapointService to specify the interval(steps) of the timestamps
Michael Rademakerfae4285e4013
diff --git a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.javaindex d760dd96a..b8c327fca 100644--- a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java@@ -112,10 +112,10 @@ public class AssetPredictedDatapointService implements ContainerService, Protoco}public ValueDatapoint[] getValueDatapoints(AttributeRef attributeRef,- DatapointInterval datapointInterval,+ String truncate,+ String interval,long fromTimestamp,long toTimestamp) {-Asset asset = assetStorageService.find(attributeRef.getEntityId());if (asset == null) {throw new IllegalStateException("Asset not found: " + attributeRef.getEntityId());@@ -135,38 +135,6 @@ public class AssetPredictedDatapointService implements ContainerService, ProtocoStringBuilder query = new StringBuilder();boolean downsample = (attributeValueType == ValueType.NUMBER || attributeValueType == ValueType.BOOLEAN);- String truncateX = null;- String interval = null;-- switch (datapointInterval) {- case MINUTE:- truncateX = "minute";- interval = "1 minute";- break;- case HOUR:- truncateX = "hour";- interval = "1 hour";- break;- case DAY:- truncateX = "day";- interval = "1 day";- break;- case WEEK:- truncateX = "day";- interval = "7 day";- break;- case MONTH:- truncateX = "day";- interval = "1 month";- break;- case YEAR:- truncateX = "month";- interval = "1 year";- break;- default:- throw new IllegalArgumentException("Can't handle interval: " + datapointInterval);- }-if (downsample) {// TODO: Change this to use something like this max min decimation algorithm https://knowledge.ni.com/KnowledgeArticleDetails?id=kA00Z0000019YLKSA2&l=en-GB)query.append("select TS as X, coalesce(AVG_VALUE, null) as Y " +@@ -213,11 +181,11 @@ public class AssetPredictedDatapointService implements ContainerService, Protocolong toTimestampSeconds = toTimestamp / 1000;if (downsample) {- st.setString(1, truncateX);+ st.setString(1, truncate);st.setLong(2, fromTimestampSeconds);st.setLong(3, toTimestampSeconds);st.setObject(4, new PGInterval(interval));- st.setString(5, truncateX);+ st.setString(5, truncate);st.setLong(6, fromTimestampSeconds);st.setLong(7, toTimestampSeconds);st.setString(8, attributeRef.getEntityId());@@ -243,6 +211,45 @@ public class AssetPredictedDatapointService implements ContainerService, Protoco);}+ public ValueDatapoint[] getValueDatapoints(AttributeRef attributeRef,+ DatapointInterval datapointInterval,+ long fromTimestamp,+ long toTimestamp) {+ String truncateX;+ String interval;++ switch (datapointInterval) {+ case MINUTE:+ truncateX = "minute";+ interval = "1 minute";+ break;+ case HOUR:+ truncateX = "hour";+ interval = "1 hour";+ break;+ case DAY:+ truncateX = "day";+ interval = "1 day";+ break;+ case WEEK:+ truncateX = "day";+ interval = "7 day";+ break;+ case MONTH:+ truncateX = "day";+ interval = "1 month";+ break;+ case YEAR:+ truncateX = "month";+ interval = "1 year";+ break;+ default:+ throw new IllegalArgumentException("Can't handle interval: " + datapointInterval);+ }++ return getValueDatapoints(attributeRef, truncateX, interval, fromTimestamp, toTimestamp);+ }+public void updateValue(AttributeRef attributeRef, Value value, long timestamp) {persistenceService.doTransaction(em -> upsertValue(em, attributeRef.getEntityId(), attributeRef.getAttributeName(), value, timestamp));}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.javaindex 1056cdc86..722dd6ff4 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@@ -42,6 +42,11 @@ public class PredictedFacade<T extends Ruleset> extends PredictedDatapoints {this.assetPredictedDatapointService = assetPredictedDatapointService;}+ @Override+ public ValueDatapoint[] getValueDataPoints(AttributeRef attributeRef, String truncate, String interval, long fromTimestamp, long toTimestamp) {+ return assetPredictedDatapointService.getValueDatapoints(attributeRef, truncate, interval, fromTimestamp, toTimestamp);+ }+@Overridepublic ValueDatapoint[] getValueDataPoints(AttributeRef attributeRef, DatapointInterval interval, long fromTimestamp, long toTimestamp) {return assetPredictedDatapointService.getValueDatapoints(attributeRef, interval, fromTimestamp, toTimestamp);diff --git a/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.java b/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.javaindex 133cadcab..387842e56 100644--- a/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.java+++ b/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.java@@ -27,6 +27,13 @@ import org.openremote.model.value.Value;public abstract class PredictedDatapoints {+ public abstract ValueDatapoint[] getValueDataPoints(AttributeRef attributeRef,+ String truncate,+ String interval,+ long fromTimestamp,+ long toTimestamp);++public abstract ValueDatapoint[] getValueDataPoints(AttributeRef attributeRef,DatapointInterval interval,long fromTimestamp,