Skip to content

armgit / core

Public Imported from GitHub
0

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

updated AssetDatapointService and AssetPredictedDatapointService to return a period of time specified by the user through the api

Michael Rademakeraa6b6a30484f
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.java
index 20da4ecbd..d379cba27 100644
--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.java
+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.java
@@ -393,25 +393,27 @@ public class AssetViewActivity
675,
200,
DatapointInterval.HOUR,
- attribute.getValueTimestamp().orElse(System.currentTimeMillis())
+ attribute.getValueTimestamp().orElse(System.currentTimeMillis()),
+ attribute.getValueTimestamp().orElse(System.currentTimeMillis()) + 1000 * 60 * 60 * 24//add a day
) {
@Override
protected void queryDatapoints(DatapointInterval interval,
- long timestamp,
+ long fromTimestamp,
+ long toTimestamp,
Consumer<ValueDatapoint[]> consumer) {
attribute.getName().ifPresent(attributeName ->
- queryDataPoints(attributeName, interval, timestamp, consumer)
+ queryDataPoints(attributeName, interval, fromTimestamp, toTimestamp, consumer)
);
}
};
}
- protected void queryDataPoints(String attributeName, DatapointInterval interval, long timestamp, Consumer<ValueDatapoint[]> consumer) {
+ protected void queryDataPoints(String attributeName, DatapointInterval interval, long fromTimestamp, long toTimestamp, Consumer<ValueDatapoint[]> consumer) {
if (!isNullOrEmpty(attributeName)) {
environment.getApp().getRequests().sendAndReturn(
numberDatapointArrayMapper,
requestParams -> assetDatapointResource.getDatapoints(
- requestParams, this.asset.getId(), attributeName, interval, timestamp
+ requestParams, this.asset.getId(), attributeName, interval, fromTimestamp, toTimestamp
),
200,
consumer
diff --git a/client/src/main/java/org/openremote/app/client/datapoint/DatapointBrowser.java b/client/src/main/java/org/openremote/app/client/datapoint/DatapointBrowser.java
index 213184715..d7d73e8c9 100644
--- a/client/src/main/java/org/openremote/app/client/datapoint/DatapointBrowser.java
+++ b/client/src/main/java/org/openremote/app/client/datapoint/DatapointBrowser.java
@@ -54,20 +54,22 @@ public abstract class DatapointBrowser extends AbstractAttributeViewExtension {
final int height;
DatapointInterval interval;
- long timestamp;
+ long fromTimestamp;
+ long toTimestamp;
Chart chart;
FormValueListBox<DatapointInterval> intervalListBox;
FormOutputText timeOutput;
FormButton nextButton;
- public DatapointBrowser(Environment environment, AttributeView.Style style, AttributeViewImpl parentView, AssetAttribute attribute, int width, int height, DatapointInterval interval, long timestamp) {
+ public DatapointBrowser(Environment environment, AttributeView.Style style, AttributeViewImpl parentView, AssetAttribute attribute, int width, int height, DatapointInterval interval, long fromTimestamp, long toTimestamp) {
super(environment, style, parentView, attribute, environment.getMessages().historicalData());
this.environment = environment;
this.width = width;
this.height = height;
this.interval = interval;
- this.timestamp = timestamp;
+ this.fromTimestamp = fromTimestamp;
+ this.toTimestamp = toTimestamp;
setStyleName("layout vertical or-DatapointBrowser");
}
@@ -90,8 +92,8 @@ public abstract class DatapointBrowser extends AbstractAttributeViewExtension {
}
@Override
- public void onAttributeChanged(long timestamp) {
- refresh(timestamp);
+ public void onAttributeChanged(long fromTimestamp) {
+ refresh(fromTimestamp, toTimestamp);
}
@Override
@@ -99,19 +101,19 @@ public abstract class DatapointBrowser extends AbstractAttributeViewExtension {
}
- public void refresh(long timestamp) {
+ public void refresh(long fromTimestamp, long toTimestamp) {
// Keep timestamp so when chart is != null at some point, it has the latest refresh timestamp
- this.timestamp = timestamp;
+ this.fromTimestamp = fromTimestamp;
if (chart == null) {
return;
}
- refresh(timestamp, intervalListBox.getValue());
+ refresh(fromTimestamp, toTimestamp, intervalListBox.getValue());
}
- public void refresh(long timestamp, DatapointInterval interval) {
- // Keep timestamp so when chart is != null at some point, it has the latest refresh timestamp
- this.timestamp = timestamp;
+ public void refresh(long fromTimestamp, long toTimestamp, DatapointInterval interval) {
+ // Keep fromTimestamp so when chart is != null at some point, it has the latest refresh fromTimestamp
+ this.fromTimestamp = fromTimestamp;
this.interval = interval;
if (chart == null) {
@@ -119,13 +121,13 @@ public abstract class DatapointBrowser extends AbstractAttributeViewExtension {
}
timeOutput.setText(
- DateTimeFormat.getFormat(Constants.DEFAULT_DATETIME_FORMAT).format(new Date(timestamp))
+ DateTimeFormat.getFormat(Constants.DEFAULT_DATETIME_FORMAT).format(new Date(fromTimestamp))
);
ValueType valueType = attribute.getType().map(AttributeValueDescriptor::getValueType).orElse(null);
if (valueType == ValueType.NUMBER || valueType == ValueType.BOOLEAN) {
- queryDatapoints(interval, timestamp, datapoints -> ChartUtil.update(
+ queryDatapoints(interval, fromTimestamp, toTimestamp, datapoints -> ChartUtil.update(
chart,
ChartUtil.convertData(datapoints)
));
@@ -174,7 +176,7 @@ public abstract class DatapointBrowser extends AbstractAttributeViewExtension {
}
}
);
- intervalListBox.addValueChangeHandler(event -> refresh(timestamp));
+ intervalListBox.addValueChangeHandler(event -> refresh(fromTimestamp, toTimestamp));
intervalListBox.setValue(interval);
intervalListBox.setAcceptableValues(Arrays.asList(DatapointInterval.values()));
intervalListBox.setEnabled(true);
@@ -191,19 +193,19 @@ public abstract class DatapointBrowser extends AbstractAttributeViewExtension {
FormButton previousButton = new FormButton();
previousButton.setIcon("arrow-circle-left");
previousButton.setText(environment.getMessages().previous());
- previousButton.addClickHandler(event -> refresh(calculateTimestamp(true)));
+ previousButton.addClickHandler(event -> refresh(calculateTimestamp(true), fromTimestamp + toTimestamp));
controlFormActions.add(previousButton);
nextButton = new FormButton();
nextButton.setIcon("arrow-circle-right");
nextButton.setText(environment.getMessages().next());
- nextButton.addClickHandler(event -> refresh(calculateTimestamp(false)));
+ nextButton.addClickHandler(event -> refresh(calculateTimestamp(false), fromTimestamp + toTimestamp));
controlFormActions.add(nextButton);
chart = ChartUtil.createLineChart(canvas.getContext2d());
// TODO: Ugly, sometimes the chart is not ready (chart == undefined but !null in Java...) so we wait a bit
- Browser.getWindow().setTimeout(() -> refresh(timestamp), 50);
+ Browser.getWindow().setTimeout(() -> refresh(fromTimestamp, toTimestamp), 50);
}
protected long calculateTimestamp(boolean subtract) {
@@ -214,15 +216,15 @@ public abstract class DatapointBrowser extends AbstractAttributeViewExtension {
long year = day * 365;
switch (intervalListBox.getValue()) {
case HOUR:
- return subtract ? (timestamp - hour) : (timestamp + hour);
+ return subtract ? (fromTimestamp - hour) : (fromTimestamp + hour);
case DAY:
- return subtract ? (timestamp - day) : (timestamp + day);
+ return subtract ? (fromTimestamp - day) : (fromTimestamp + day);
case WEEK:
- return subtract ? (timestamp - week) : (timestamp + week);
+ return subtract ? (fromTimestamp - week) : (fromTimestamp + week);
case MONTH:
- return subtract ? (timestamp - month) : (timestamp + month);
+ return subtract ? (fromTimestamp - month) : (fromTimestamp + month);
case YEAR:
- return subtract ? (timestamp - year) : (timestamp + year);
+ return subtract ? (fromTimestamp - year) : (fromTimestamp + year);
default:
throw new IllegalArgumentException("Unsupported time period: " + intervalListBox.getValue());
}
@@ -240,6 +242,7 @@ public abstract class DatapointBrowser extends AbstractAttributeViewExtension {
}
abstract protected void queryDatapoints(DatapointInterval interval,
- long timestamp,
+ long fromTimestamp,
+ long toTimestamp,
Consumer<ValueDatapoint[]> consumer);
-}
\ No newline at end of file
+}
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
index a765877ed..7f8fb9bf9 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
@@ -56,7 +56,8 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
String assetId,
String attributeName,
DatapointInterval interval,
- long timestamp) {
+ long fromTimestamp,
+ long toTimestamp) {
try {
if (isRestrictedUser() && !assetStorageService.isUserAsset(getUserId(), assetId)) {
@@ -81,7 +82,8 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
return assetDatapointService.getValueDatapoints(
attribute,
interval,
- timestamp
+ fromTimestamp,
+ toTimestamp
);
} catch (IllegalStateException ex) {
throw new WebApplicationException(ex, Response.Status.BAD_REQUEST);
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 b96bbb22a..c1da2af74 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
@@ -168,7 +168,8 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
public ValueDatapoint[] getValueDatapoints(AssetAttribute attribute,
DatapointInterval datapointInterval,
- long timestamp) {
+ long fromTimestamp,
+ long toTimestamp) {
AttributeRef attributeRef = attribute.getReferenceOrThrow();
ValueType attributeValueType = attribute.getTypeOrThrow().getValueType();
@@ -181,33 +182,31 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
public ValueDatapoint[] execute(Connection connection) throws SQLException {
String truncateX;
- String step;
String interval;
switch (datapointInterval) {
- case HOUR:
+ case MINUTE:
truncateX = "minute";
- step = "1 minute";
+ interval = "1 minute";
+ break;
+ case HOUR:
+ truncateX = "hour";
interval = "1 hour";
break;
case DAY:
- truncateX = "hour";
- step = "1 hour";
+ truncateX = "day";
interval = "1 day";
break;
case WEEK:
truncateX = "day";
- step = "1 day";
interval = "7 day";
break;
case MONTH:
- truncateX = "day";
- step = "1 day";
+ truncateX = "month";
interval = "1 month";
break;
case YEAR:
truncateX = "month";
- step = "1 month";
interval = "1 year";
break;
default:
@@ -223,7 +222,7 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
query.append("select TS as X, coalesce(AVG_VALUE, null) as Y " +
" from ( " +
" select date_trunc(?, GS)::timestamp TS " +
- " from generate_series(to_timestamp(?) - ?, to_timestamp(?), ?) GS " +
+ " from generate_series(to_timestamp(?), to_timestamp(?), ?) GS " +
" ) TS " +
" left join ( " +
" select " +
@@ -237,7 +236,7 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
query.append(" from ASSET_DATAPOINT " +
" where " +
- " TIMESTAMP >= to_timestamp(?) - ? " +
+ " TIMESTAMP >= to_timestamp(?) " +
" and " +
" TIMESTAMP <= to_timestamp(?) " +
" and " +
@@ -249,7 +248,7 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
} else {
query.append("select distinct TIMESTAMP AS X, value AS Y from ASSET_DATAPOINT " +
"where " +
- "TIMESTAMP >= to_timestamp(?) - ? " +
+ "TIMESTAMP >= to_timestamp(?)" +
"and " +
"TIMESTAMP <= to_timestamp(?) " +
"and " +
@@ -259,25 +258,23 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
try (PreparedStatement st = connection.prepareStatement(query.toString())) {
- long timestampSeconds = timestamp / 1000;
+ long fromTimestampSeconds = fromTimestamp / 1000;
+ long toTimestampSeconds = toTimestamp / 1000;
if (downsample) {
st.setString(1, truncateX);
- st.setLong(2, timestampSeconds);
- st.setObject(3, new PGInterval(interval));
- st.setLong(4, timestampSeconds);
- st.setObject(5, new PGInterval(step));
- st.setString(6, truncateX);
- st.setLong(7, timestampSeconds);
- st.setObject(8, new PGInterval(interval));
- st.setLong(9, timestampSeconds);
- st.setString(10, attributeRef.getEntityId());
- st.setString(11, attributeRef.getAttributeName());
+ st.setLong(2, fromTimestampSeconds);
+ st.setLong(3, toTimestampSeconds);
+ st.setObject(4, new PGInterval(interval));
+ st.setString(5, truncateX);
+ st.setLong(6, fromTimestampSeconds);
+ st.setLong(7, toTimestampSeconds);
+ st.setString(8, attributeRef.getEntityId());
+ st.setString(9, attributeRef.getAttributeName());
} else {
- st.setLong(1, timestampSeconds);
- st.setObject(2, new PGInterval(interval));
- st.setLong(3, timestampSeconds);
- st.setString(4, attributeRef.getEntityId());
- st.setString(5, attributeRef.getAttributeName());
+ st.setLong(1, fromTimestampSeconds);
+ st.setLong(2, toTimestampSeconds);
+ st.setString(3, attributeRef.getEntityId());
+ st.setString(4, attributeRef.getAttributeName());
}
try (ResultSet rs = st.executeQuery()) {
diff --git a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java
index b5d40f82f..8535567ec 100644
--- a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java
@@ -25,6 +25,7 @@ import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebResource;
import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetAttribute;
+import org.openremote.model.datapoint.DatapointInterval;
import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.http.RequestParams;
import org.openremote.model.predicted.AssetPredictedDatapointResource;
@@ -52,10 +53,11 @@ public class AssetPredictedDatapointResourceImpl extends ManagerWebResource impl
@Override
public ValueDatapoint[] getPredictedDatapoints(@BeanParam RequestParams requestParams,
- String assetId,
- String attributeName,
- long fromTimestamp,
- long toTimestamp) {
+ String assetId,
+ String attributeName,
+ DatapointInterval datapointInterval,
+ long fromTimestamp,
+ long toTimestamp) {
try {
if (isRestrictedUser() && !assetStorageService.isUserAsset(getUserId(), assetId)) {
@@ -79,6 +81,7 @@ public class AssetPredictedDatapointResourceImpl extends ManagerWebResource impl
return assetPredictedDatapointService.getValueDatapoints(
attribute.getReferenceOrThrow(),
+ datapointInterval,
fromTimestamp,
toTimestamp
);
diff --git a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java
index 94a5e5a49..9922150b9 100644
--- a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java
@@ -28,10 +28,14 @@ import org.openremote.container.timer.TimerService;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebService;
+import org.openremote.model.asset.Asset;
import org.openremote.model.attribute.AttributeRef;
+import org.openremote.model.datapoint.DatapointInterval;
import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.value.Value;
+import org.openremote.model.value.ValueType;
import org.openremote.model.value.Values;
+import org.postgresql.util.PGInterval;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
@@ -48,6 +52,7 @@ public class AssetPredictedDatapointService implements ContainerService {
private static final Logger LOG = Logger.getLogger(AssetPredictedDatapointService.class.getName());
protected PersistenceService persistenceService;
+ protected AssetStorageService assetStorageService;
@Override
public int getPriority() {
@@ -57,6 +62,7 @@ public class AssetPredictedDatapointService implements ContainerService {
@Override
public void init(Container container) throws Exception {
persistenceService = container.getService(PersistenceService.class);
+ assetStorageService = container.getService(AssetStorageService.class);
container.getService(ManagerWebService.class).getApiSingletons().add(
new AssetPredictedDatapointResourceImpl(
@@ -104,9 +110,19 @@ public class AssetPredictedDatapointService implements ContainerService {
}
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());
+ }
+ ValueType attributeValueType = asset.getAttribute(attributeRef.getAttributeName())
+ .orElseThrow(() -> new IllegalStateException("Attribute not found: " + attributeRef.getAttributeName()))
+ .getTypeOrThrow()
+ .getValueType();
+
LOG.fine("Getting predicted datapoints for: " + attributeRef);
return persistenceService.doReturningTransaction(entityManager ->
@@ -115,25 +131,104 @@ public class AssetPredictedDatapointService implements ContainerService {
public ValueDatapoint[] execute(Connection connection) throws SQLException {
StringBuilder query = new StringBuilder();
+ boolean downsample = (attributeValueType == ValueType.NUMBER || attributeValueType == ValueType.BOOLEAN);
+
+ String truncateX = null;
+ String interval = null;
+
+ switch (datapointInterval) {
+ case NONE:
+ downsample = false;
+ break;
+ 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 " +
+ " from ( " +
+ " select date_trunc(?, GS)::timestamp TS " +
+ " from generate_series(to_timestamp(?), to_timestamp(?), ?) GS " +
+ " ) TS " +
+ " left join ( " +
+ " select " +
+ " date_trunc(?, TIMESTAMP)::timestamp as TS, ");
- query.append("select distinct TIMESTAMP AS X, value AS Y from ASSET_PREDICTED_DATAPOINT " +
- "where " +
- "TIMESTAMP >= to_timestamp(?) " +
- "and " +
- "TIMESTAMP < to_timestamp(?) " +
- "and " +
- "ENTITY_ID = ? and ATTRIBUTE_NAME = ? "
- );
+ if (attributeValueType == ValueType.NUMBER) {
+ query.append(" AVG(VALUE::text::numeric) as AVG_VALUE ");
+ } else {
+ query.append(" AVG(case when VALUE::text::boolean is true then 1 else 0 end) as AVG_VALUE ");
+ }
+
+ query.append(" from ASSET_PREDICTED_DATAPOINT " +
+ " where " +
+ " TIMESTAMP >= to_timestamp(?) " +
+ " and " +
+ " TIMESTAMP <= to_timestamp(?) " +
+ " and " +
+ " ENTITY_ID = ? and ATTRIBUTE_NAME = ? " +
+ " group by TS " +
+ " ) DP using (TS) " +
+ " order by TS asc "
+ );
+
+ } else {
+ query.append("select distinct TIMESTAMP AS X, value AS Y from ASSET_PREDICTED_DATAPOINT " +
+ "where " +
+ "TIMESTAMP >= to_timestamp(?) " +
+ "and " +
+ "TIMESTAMP < to_timestamp(?) " +
+ "and " +
+ "ENTITY_ID = ? and ATTRIBUTE_NAME = ? "
+ );
+ }
try (PreparedStatement st = connection.prepareStatement(query.toString())) {
long fromTimestampSeconds = fromTimestamp / 1000;
long toTimestampSeconds = toTimestamp / 1000;
- st.setLong(1, fromTimestampSeconds);
- st.setLong(2, toTimestampSeconds);
- st.setString(3, attributeRef.getEntityId());
- st.setString(4, attributeRef.getAttributeName());
+ if (downsample) {
+ st.setString(1, truncateX);
+ st.setLong(2, fromTimestampSeconds);
+ st.setLong(3, toTimestampSeconds);
+ st.setObject(4, new PGInterval(interval));
+ st.setString(5, truncateX);
+ st.setLong(6, fromTimestampSeconds);
+ st.setLong(7, toTimestampSeconds);
+ st.setString(8, attributeRef.getEntityId());
+ st.setString(9, attributeRef.getAttributeName());
+ } else {
+ st.setLong(1, fromTimestampSeconds);
+ st.setLong(2, toTimestampSeconds);
+ st.setString(3, attributeRef.getEntityId());
+ st.setString(4, attributeRef.getAttributeName());
+ }
try (ResultSet rs = st.executeQuery()) {
List<ValueDatapoint<?>> result = new ArrayList<>();
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 69f9e0fc8..5b613854d 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
@@ -22,6 +22,7 @@ package org.openremote.manager.rules.facade;
import org.openremote.manager.predicted.AssetPredictedDatapointService;
import org.openremote.manager.rules.RulesEngineId;
import org.openremote.model.attribute.AttributeRef;
+import org.openremote.model.datapoint.DatapointInterval;
import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.rules.PredictedDatapoints;
import org.openremote.model.rules.Ruleset;
@@ -43,7 +44,7 @@ public class PredictedFacade<T extends Ruleset> extends PredictedDatapoints {
@Override
public ValueDatapoint[] getValueDataPoints(AttributeRef attributeRef, long fromTimestamp, long toTimestamp) {
- return assetPredictedDatapointService.getValueDatapoints(attributeRef, fromTimestamp, toTimestamp);
+ return assetPredictedDatapointService.getValueDatapoints(attributeRef, DatapointInterval.NONE, fromTimestamp, toTimestamp);
}
@Override
diff --git a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
index 4b0b363c8..0f541fb0d 100644
--- a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
+++ b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
@@ -23,7 +23,6 @@ import jsinterop.annotations.JsType;
import org.openremote.model.Constants;
import org.openremote.model.http.RequestParams;
import org.openremote.model.http.SuccessStatusCode;
-import org.openremote.model.value.Value;
import javax.annotation.security.RolesAllowed;
import javax.ws.rs.*;
@@ -48,9 +47,10 @@ public interface AssetDatapointResource {
@RolesAllowed({Constants.READ_ASSETS_ROLE})
@SuppressWarnings("unusable-by-js")
ValueDatapoint[] getDatapoints(@BeanParam RequestParams requestParams,
- @PathParam("assetId") String assetId,
- @PathParam("attributeName") String attributeName,
- @QueryParam("interval") DatapointInterval datapointInterval,
- @QueryParam("timestamp") long timestamp);
+ @PathParam("assetId") String assetId,
+ @PathParam("attributeName") String attributeName,
+ @QueryParam("interval") DatapointInterval datapointInterval,
+ @QueryParam("fromTimestamp") long fromTimestamp,
+ @QueryParam("toTimestamp") long toTimestamp);
}
diff --git a/model/src/main/java/org/openremote/model/datapoint/DatapointInterval.java b/model/src/main/java/org/openremote/model/datapoint/DatapointInterval.java
index b52909dc6..d0517bf17 100644
--- a/model/src/main/java/org/openremote/model/datapoint/DatapointInterval.java
+++ b/model/src/main/java/org/openremote/model/datapoint/DatapointInterval.java
@@ -21,10 +21,11 @@ package org.openremote.model.datapoint;
public enum DatapointInterval {
+ NONE,
+ MINUTE,
HOUR,
DAY,
WEEK,
MONTH,
YEAR
-
}
diff --git a/model/src/main/java/org/openremote/model/predicted/AssetPredictedDatapointResource.java b/model/src/main/java/org/openremote/model/predicted/AssetPredictedDatapointResource.java
index b06deace5..89ec2043e 100644
--- a/model/src/main/java/org/openremote/model/predicted/AssetPredictedDatapointResource.java
+++ b/model/src/main/java/org/openremote/model/predicted/AssetPredictedDatapointResource.java
@@ -21,6 +21,7 @@ package org.openremote.model.predicted;
import jsinterop.annotations.JsType;
import org.openremote.model.Constants;
+import org.openremote.model.datapoint.DatapointInterval;
import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.http.RequestParams;
import org.openremote.model.http.SuccessStatusCode;
@@ -49,6 +50,7 @@ public interface AssetPredictedDatapointResource {
ValueDatapoint[] getPredictedDatapoints(@BeanParam RequestParams requestParams,
@PathParam("assetId") String assetId,
@PathParam("attributeName") String attributeName,
+ @QueryParam("interval") DatapointInterval datapointInterval,
@QueryParam("fromTimestamp") long fromTimestamp,
@QueryParam("toTimestamp") long toTimestamp);
diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.ts
index 50b712a2c..277e424c6 100644
--- a/ui/component/or-attribute-history/src/index.ts
+++ b/ui/component/or-attribute-history/src/index.ts
@@ -230,7 +230,10 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
public interval?: DatapointInterval;
@property({type: Number})
- public timestamp?: Date;
+ public fromTimestamp?: Date;
+
+ @property({type: Number})
+ public toTimestamp?: Date;
@property({type: Object})
public config?: HistoryConfig;
@@ -267,13 +270,18 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
let returnFalse = false;
- if (!this.timestamp) {
- this.timestamp = new Date();
+ if (!this.fromTimestamp) {
+ this.fromTimestamp = new Date();
+ returnFalse = true;
+ }
+
+ if (!this.toTimestamp) {
+ this.toTimestamp = moment(this.fromTimestamp).add(1, "day").toDate();
returnFalse = true;
}
if (!this.interval) {
- this.interval = DatapointInterval.DAY;
+ this.interval = DatapointInterval.HOUR;
returnFalse = true;
}
@@ -308,9 +316,9 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
<div id="controls">
<or-input .type="${InputType.SELECT}" ?disabled="${disabled}" .label="${i18next.t("period")}" @or-input-changed="${(evt: OrInputChangedEvent) => this.interval = evt.detail.value}" .value="${this.interval}" .options="${this._getIntervalOptions()}"></or-input>
<div id="ending-controls">
- <or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled}" icon="chevron-left" @click="${() => this._updateTimestamp(this.timestamp!, false)}"></or-input>
- <or-input id="ending-date" .type="${InputType.DATETIME}" ?disabled="${disabled}" label="${i18next.t("ending")}" .value="${this.timestamp}" @or-input-changed="${(evt: OrInputChangedEvent) => this._updateTimestamp(moment(evt.detail.value as string).toDate())}"></or-input>
- <or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled}" icon="chevron-right" @click="${() => this._updateTimestamp(this.timestamp!, true)}"></or-input>
+ <or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled}" icon="chevron-left" @click="${() => this._updateTimestamp(this.fromTimestamp!, false)}"></or-input>
+ <or-input id="ending-date" .type="${InputType.DATETIME}" ?disabled="${disabled}" label="${i18next.t("ending")}" .value="${this.fromTimestamp}" @or-input-changed="${(evt: OrInputChangedEvent) => this._updateTimestamp(moment(evt.detail.value as string).toDate())}"></or-input>
+ <or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled}" icon="chevron-right" @click="${() => this._updateTimestamp(this.fromTimestamp!, true)}"></or-input>
<or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled}" icon="chevron-double-right" @click="${() => this._updateTimestamp(new Date())}"></or-input>
</div>
</div>
@@ -320,7 +328,7 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
<or-translate value="invalidAttribute"></or-translate>
</div>
` : isChart
- ? html`
+ ? html`
<div id="chart-container">
<canvas id="chart"></canvas>
</div>
@@ -661,7 +669,7 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
return;
}
- if (!this.interval || !this.timestamp) {
+ if (!this.interval || !this.fromTimestamp || !this.toTimestamp) {
this._loading = false;
return;
}
@@ -670,8 +678,9 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
assetId,
attributeName,
{
- interval: this.interval || DatapointInterval.DAY,
- timestamp: this.timestamp.getTime()
+ interval: this.interval || DatapointInterval.HOUR,
+ fromTimestamp: this.fromTimestamp.getTime(),
+ toTimestamp: this.toTimestamp.getTime()
}
);
@@ -688,27 +697,36 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
}
const newMoment = moment(timestamp);
-
- if (forward !== undefined) {
- switch (this.interval) {
- case DatapointInterval.HOUR:
- newMoment.add(forward ? 1 : -1, "hour");
- break;
- case DatapointInterval.DAY:
- newMoment.add(forward ? 1 : -1, "day");
- break;
- case DatapointInterval.WEEK:
- newMoment.add(forward ? 1 : -1, "week");
- break;
- case DatapointInterval.MONTH:
- newMoment.add(forward ? 1 : -1, "month");
- break;
- case DatapointInterval.YEAR:
- newMoment.add(forward ? 1 : -1, "year");
- break;
- }
+ const newToMoment = moment(timestamp);
+ const forwardAmount = forward !== undefined ? forward ? 1 : -1 : 0;
+ switch (this.interval) {
+ case DatapointInterval.MINUTE:
+ newMoment.add(forwardAmount, "hour");
+ newToMoment.add(1, "hour");
+ break;
+ case DatapointInterval.HOUR:
+ newMoment.add(forwardAmount, "day");
+ newToMoment.add(1, "day");
+ break;
+ case DatapointInterval.DAY:
+ newMoment.add(forwardAmount, "week");
+ newToMoment.add(1, "week");
+ break;
+ case DatapointInterval.WEEK:
+ newMoment.add(forwardAmount, "month");
+ newToMoment.add(1, "month");
+ break;
+ case DatapointInterval.MONTH:
+ newMoment.add(forwardAmount, "year");
+ newToMoment.add(1, "year");
+ break;
+ case DatapointInterval.YEAR:
+ newMoment.add(forwardAmount, "year");
+ newToMoment.add(7, "year");
+ break;
}
- this.timestamp = newMoment.toDate();
+ this.fromTimestamp = newMoment.toDate();
+ this.toTimestamp = newToMoment.toDate();
}
}
diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.ts
index 992f4a7b1..0d0a03730 100644
--- a/ui/component/or-chart/src/index.ts
+++ b/ui/component/or-chart/src/index.ts
@@ -11,7 +11,7 @@ import {
} from "lit-element";
import i18next from "i18next";
import {translate} from "@openremote/or-translate";
-import {Asset, AssetAttribute, Attribute, AttributeRef, DatapointInterval, MetaItemType} from "@openremote/model";
+import {Asset, AssetAttribute, AttributeRef, DatapointInterval, MetaItemType} from "@openremote/model";
import manager, {
AssetModelUtil,
DefaultColor2,
@@ -348,7 +348,7 @@ export class OrChart extends translate(i18next)(LitElement) {
public usedColors: string[] = [];
@property({type: String})
- public interval?: DatapointInterval = DatapointInterval.DAY;
+ public interval?: DatapointInterval = DatapointInterval.HOUR;
@property({type: Number})
public timestamp?: Date = moment().set('minute', 0).toDate();
@@ -554,6 +554,7 @@ export class OrChart extends translate(i18next)(LitElement) {
getInputType() {
switch(this.interval) {
+ case DatapointInterval.MINUTE:
case DatapointInterval.HOUR:
return InputType.DATETIME;
break;
@@ -687,7 +688,7 @@ export class OrChart extends translate(i18next)(LitElement) {
if(this.activeAsset){
const attr = Util.getAssetAttribute(this.activeAsset, elm.value);
if(attr){
- const color = this.colors.filter(color => this.usedColors.indexOf( color ) < 0)[0]
+ const color = this.colors.filter(color => this.usedColors.indexOf(color) < 0)[0];
const meta = {name: "color", value: color};
if(attr.meta){
attr.meta.push(meta);
@@ -740,6 +741,10 @@ export class OrChart extends translate(i18next)(LitElement) {
protected _getIntervalOptions(){
return [
+ {
+ text: i18next.t(DatapointInterval.MINUTE),
+ value: DatapointInterval.MINUTE
+ },
{
text: i18next.t(DatapointInterval.HOUR),
value: DatapointInterval.HOUR
@@ -856,20 +861,23 @@ export class OrChart extends translate(i18next)(LitElement) {
if(this.periodCompare) {
const initialTimestamp = moment(this.timestamp);
switch (this.interval) {
+ case DatapointInterval.MINUTE:
+ newMoment = moment(timestamp);
+ break;
case DatapointInterval.HOUR:
- newMoment = moment(timestamp)
+ newMoment = moment(timestamp).set('day', initialTimestamp.day());
break;
case DatapointInterval.DAY:
- newMoment = moment(timestamp).set('day', initialTimestamp.day())
+ newMoment = moment(timestamp).set('week', initialTimestamp.week());
break;
case DatapointInterval.WEEK:
- newMoment = moment(timestamp).set('week', initialTimestamp.week())
+ newMoment = moment(timestamp).set('month', initialTimestamp.month());
break;
case DatapointInterval.MONTH:
- newMoment = moment(timestamp).set('month', initialTimestamp.month())
+ newMoment = moment(timestamp).set('year', initialTimestamp.year());
break;
case DatapointInterval.YEAR:
- newMoment = moment(timestamp).set('year', initialTimestamp.year())
+ newMoment = moment(timestamp).set('year', initialTimestamp.year());
break;
}
}
@@ -892,13 +900,16 @@ export class OrChart extends translate(i18next)(LitElement) {
const period = this._getUnitOfTime();
const forwardTime = this._updateTimestamp(timestamp, true);
const startOfPeriod = moment(forwardTime).startOf(period).toDate().getTime();
- if(attribute.assetId && attribute.name){
+ const endOfPeriod = moment(timestamp).endOf(period).toDate().getTime();
+
+ if (attribute.assetId && attribute.name) {
const response = await manager.rest.api.AssetDatapointResource.getDatapoints(
attribute.assetId,
attribute.name,
{
- interval: this.interval || DatapointInterval.DAY,
- timestamp: startOfPeriod
+ interval: this.interval || DatapointInterval.HOUR,
+ fromTimestamp: startOfPeriod,
+ toTimestamp: endOfPeriod
}
);
@@ -907,16 +918,16 @@ export class OrChart extends translate(i18next)(LitElement) {
this._loading = false;
if (response.status === 200) {
- data.map((datapoint:any) => {
- if(datapoint['x']) {
+ data.map((datapoint: any) => {
+ if (datapoint['x']) {
datapoint['x'] = this._timestampLabel(datapoint['x'])
}
- if(datapoint['y']) {
- datapoint['y'] = Math.round(datapoint['y'] * 100)/100
+ if (datapoint['y']) {
+ datapoint['y'] = Math.round(datapoint['y'] * 100) / 100
} else {
delete datapoint['y']
}
- })
+ });
return data;
}
}
@@ -934,17 +945,16 @@ export class OrChart extends translate(i18next)(LitElement) {
return [];
}
const period = this._getUnitOfTime();
- const now = moment().toDate().getTime();
const startOfPeriod = moment(timestamp).startOf(period).toDate().getTime();
const endOfPeriod = moment(timestamp).endOf(period).toDate().getTime();
- const fromTimestamp = now < startOfPeriod ? startOfPeriod : now;
if(attribute.assetId && attribute.name && endOfPeriod){
const response = await manager.rest.api.AssetPredictedDatapointResource.getPredictedDatapoints(
attribute.assetId,
attribute.name,
{
- fromTimestamp: fromTimestamp,
+ interval: this.interval || DatapointInterval.HOUR,
+ fromTimestamp: startOfPeriod,
toTimestamp: endOfPeriod
}
);
@@ -959,16 +969,16 @@ export class OrChart extends translate(i18next)(LitElement) {
return 0;
}
});
- data.map((datapoint:any) => {
- if(datapoint['x']) {
+ data.map((datapoint: any) => {
+ if (datapoint['x']) {
datapoint['x'] = this._timestampLabel(datapoint['x'])
}
- if(datapoint['y']) {
- datapoint['y'] = Math.round(datapoint['y'] * 100)/100
+ if (datapoint['y']) {
+ datapoint['y'] = Math.round(datapoint['y'] * 100) / 100
} else {
delete datapoint['y']
}
- })
+ });
return data;
}
}
@@ -977,17 +987,20 @@ export class OrChart extends translate(i18next)(LitElement) {
protected _getUnitOfTime() {
let unit:unitOfTime.All = 'day';
switch (this.interval) {
- case DatapointInterval.HOUR:
+ case DatapointInterval.MINUTE:
unit = "hour";
break;
+ case DatapointInterval.HOUR:
+ unit = "day";
+ break;
case DatapointInterval.DAY:
- unit = 'day';
+ unit = 'week';
break;
case DatapointInterval.WEEK:
- unit = 'week';
+ unit = 'month';
break;
case DatapointInterval.MONTH:
- unit = 'month';
+ unit = 'year';
break;
case DatapointInterval.YEAR:
unit = 'year';
@@ -1006,21 +1019,24 @@ export class OrChart extends translate(i18next)(LitElement) {
if (forward !== undefined) {
switch (this.interval) {
- case DatapointInterval.HOUR:
+ case DatapointInterval.MINUTE:
newMoment.add(forward ? 1 : -1, "hour");
break;
- case DatapointInterval.DAY:
+ case DatapointInterval.HOUR:
newMoment.add(forward ? 1 : -1, "day");
break;
- case DatapointInterval.WEEK:
+ case DatapointInterval.DAY:
newMoment.add(forward ? 1 : -1, "week");
break;
- case DatapointInterval.MONTH:
+ case DatapointInterval.WEEK:
newMoment.add(forward ? 1 : -1, "month");
break;
- case DatapointInterval.YEAR:
+ case DatapointInterval.MONTH:
newMoment.add(forward ? 1 : -1, "year");
break;
+ case DatapointInterval.YEAR:
+ newMoment.add(forward ? 7 : -7, "year");
+ break;
}
}