Skip to content

armgit / core

Public Imported from GitHub
0

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

Replaced NumberDatapoint with generic ValueDatapoint (boolean and number data is downsampled as required but other data types return raw data)

Rich Turner06b993060af5
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 4e146710b..da8fe53bb 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
@@ -42,9 +42,8 @@ import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.attribute.AttributeExecuteStatus;
import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.datapoint.AssetDatapointResource;
-import org.openremote.model.datapoint.Datapoint;
import org.openremote.model.datapoint.DatapointInterval;
-import org.openremote.model.datapoint.NumberDatapoint;
+import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.event.shared.TenantFilter;
import org.openremote.model.interop.Consumer;
import org.openremote.model.map.MapResource;
@@ -347,7 +346,7 @@ public class AssetViewActivity
protected List<AbstractAttributeViewExtension> createAttributeExtensions(AssetAttribute attribute, AttributeViewImpl view) {
List<AbstractAttributeViewExtension> viewExtensions = new ArrayList<>();
- if (Datapoint.isDatapointsCapable(attribute) && attribute.isStoreDatapoints()) {
+ if (attribute.isStoreDatapoints()) {
viewExtensions.add(
createDatapointBrowser(attribute, view)
);
@@ -397,7 +396,7 @@ public class AssetViewActivity
@Override
protected void queryDatapoints(DatapointInterval interval,
long timestamp,
- Consumer<NumberDatapoint[]> consumer) {
+ Consumer<ValueDatapoint[]> consumer) {
attribute.getName().ifPresent(attributeName ->
queryDataPoints(attributeName, interval, timestamp, consumer)
);
@@ -405,11 +404,11 @@ public class AssetViewActivity
};
}
- protected void queryDataPoints(String attributeName, DatapointInterval interval, long timestamp, Consumer<NumberDatapoint[]> consumer) {
+ protected void queryDataPoints(String attributeName, DatapointInterval interval, long timestamp, Consumer<ValueDatapoint[]> consumer) {
if (!isNullOrEmpty(attributeName)) {
environment.getApp().getRequests().sendAndReturn(
numberDatapointArrayMapper,
- requestParams -> assetDatapointResource.getNumberDatapoints(
+ requestParams -> assetDatapointResource.getDatapoints(
requestParams, this.asset.getId(), attributeName, interval, timestamp
),
200,
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 7a873f8b9..213184715 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
@@ -35,9 +35,11 @@ import org.openremote.app.client.widget.*;
import org.openremote.model.Constants;
import org.openremote.model.asset.AssetAttribute;
import org.openremote.model.attribute.AttributeValidationResult;
+import org.openremote.model.attribute.AttributeValueDescriptor;
import org.openremote.model.datapoint.DatapointInterval;
-import org.openremote.model.datapoint.NumberDatapoint;
+import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.interop.Consumer;
+import org.openremote.model.value.ValueType;
import java.util.Arrays;
import java.util.Date;
@@ -120,11 +122,14 @@ public abstract class DatapointBrowser extends AbstractAttributeViewExtension {
DateTimeFormat.getFormat(Constants.DEFAULT_DATETIME_FORMAT).format(new Date(timestamp))
);
- queryDatapoints(interval, timestamp, numberDatapoints -> ChartUtil.update(
- chart,
- ChartUtil.convertLabels(numberDatapoints),
- ChartUtil.convertData(numberDatapoints)
- ));
+ ValueType valueType = attribute.getType().map(AttributeValueDescriptor::getValueType).orElse(null);
+
+ if (valueType == ValueType.NUMBER || valueType == ValueType.BOOLEAN) {
+ queryDatapoints(interval, timestamp, datapoints -> ChartUtil.update(
+ chart,
+ ChartUtil.convertData(datapoints)
+ ));
+ }
}
protected void createChart() {
@@ -236,5 +241,5 @@ public abstract class DatapointBrowser extends AbstractAttributeViewExtension {
abstract protected void queryDatapoints(DatapointInterval interval,
long timestamp,
- Consumer<NumberDatapoint[]> consumer);
+ Consumer<ValueDatapoint[]> consumer);
}
\ No newline at end of file
diff --git a/client/src/main/java/org/openremote/app/client/datapoint/NumberDatapointArrayMapper.java b/client/src/main/java/org/openremote/app/client/datapoint/NumberDatapointArrayMapper.java
index 143330106..cee905651 100644
--- a/client/src/main/java/org/openremote/app/client/datapoint/NumberDatapointArrayMapper.java
+++ b/client/src/main/java/org/openremote/app/client/datapoint/NumberDatapointArrayMapper.java
@@ -23,10 +23,10 @@ import com.github.nmorel.gwtjackson.client.ObjectMapper;
import com.github.nmorel.gwtjackson.client.annotation.JsonMixIns;
import org.openremote.app.client.interop.jackson.DefaultJsonMixin;
import org.openremote.app.client.rest.EntityReader;
-import org.openremote.model.datapoint.NumberDatapoint;
+import org.openremote.model.datapoint.ValueDatapoint;
-@JsonMixIns({@JsonMixIns.JsonMixIn(target = NumberDatapoint.class, mixIn = DefaultJsonMixin.class)})
+@JsonMixIns({@JsonMixIns.JsonMixIn(target = ValueDatapoint.class, mixIn = DefaultJsonMixin.class)})
public interface NumberDatapointArrayMapper
- extends ObjectMapper<NumberDatapoint[]>,
- EntityReader<NumberDatapoint[]> {
+ extends ObjectMapper<ValueDatapoint[]>,
+ EntityReader<ValueDatapoint[]> {
}
diff --git a/client/src/main/java/org/openremote/app/client/interop/chartjs/ChartUtil.java b/client/src/main/java/org/openremote/app/client/interop/chartjs/ChartUtil.java
index 93f2eebbb..aa1f0c17e 100644
--- a/client/src/main/java/org/openremote/app/client/interop/chartjs/ChartUtil.java
+++ b/client/src/main/java/org/openremote/app/client/interop/chartjs/ChartUtil.java
@@ -23,38 +23,39 @@ import com.google.gwt.canvas.dom.client.Context2d;
import com.google.gwt.core.client.*;
import com.google.gwt.json.client.JSONArray;
import com.google.gwt.json.client.JSONNumber;
-import org.openremote.model.datapoint.NumberDatapoint;
+import com.google.gwt.json.client.JSONObject;
+import org.openremote.model.datapoint.ValueDatapoint;
+import org.openremote.model.value.Value;
+import org.openremote.model.value.Values;
/**
* TODO Use JSInterop instead
*/
public class ChartUtil {
- static public JavaScriptObject convertLabels(NumberDatapoint[] numberDatapoints) {
- JsArrayString array = (JsArrayString) JsArrayString.createArray();
- for (int i = 0; i < numberDatapoints.length; i++) {
- NumberDatapoint numberDatapoint = numberDatapoints[i];
- array.set(i, numberDatapoint.getLabel());
- }
- return array;
- }
+// static public JavaScriptObject convertLabels(ValueDatapoint[] numberDatapoints) {
+// JsArrayString array = (JsArrayString) JsArrayString.createArray();
+// for (int i = 0; i < numberDatapoints.length; i++) {
+// ValueDatapoint numberDatapoint = numberDatapoints[i];
+// array.set(i, numberDatapoint.getLabel());
+// }
+// return array;
+// }
- static public JavaScriptObject convertData(NumberDatapoint[] numberDatapoints) {
+ static public JavaScriptObject convertData(ValueDatapoint[] dps) {
JSONArray array = new JSONArray();
- for (int i = 0; i < numberDatapoints.length; i++) {
- NumberDatapoint numberDatapoint = numberDatapoints[i];
- Number number = numberDatapoint.getNumber();
- if (number != null) {
- array.set(i, new JSONNumber(number.doubleValue()));
- } else {
- array.set(i, null);
- }
+ for (int i = 0; i < dps.length; i++) {
+ ValueDatapoint dp = dps[i];
+ Value value = dp.getValue();
+ JSONObject obj = new JSONObject();
+ obj.put("x", new JSONNumber(dp.getTimestamp()));
+ obj.put("y", value != null ? new JSONNumber(Values.getNumber(value).orElse(0d)) : null);
+ array.set(i, obj);
}
return array.getJavaScriptObject();
}
- public native static void update(Chart chart, JavaScriptObject labels, JavaScriptObject data) /*-{
- chart.data.labels = labels;
+ public native static void update(Chart chart, JavaScriptObject data) /*-{
chart.data.datasets[0].data = data;
chart.update();
}-*/;
@@ -120,6 +121,11 @@ public class ChartUtil {
}
}],
xAxes: [{
+ type: "time",
+ time: {
+ unit: "minute",
+ parser: "x"
+ },
ticks: {
autoSkip: true,
maxTicksLimit: 30,
diff --git a/client/src/main/webapp/package.json b/client/src/main/webapp/package.json
index 422c84899..54f639e3b 100644
--- a/client/src/main/webapp/package.json
+++ b/client/src/main/webapp/package.json
@@ -22,7 +22,7 @@
"chart.js": "^2.7.0",
"font-awesome": "^4.7.0",
"intl": "^1.2.5",
- "moment": "^2.20.1"
+ "moment": "^2.24.0"
},
"resolutions": {
"@polymer/polymer": "^2.6.1",
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.json
index 76de7d297..e99bf7271 100644
--- a/deployment/manager/shared/locales/en/or.json
+++ b/deployment/manager/shared/locales/en/or.json
@@ -80,4 +80,5 @@
"showOnMap": "Show on map",
"noAssetSelected": "Please select an asset on the left",
"loading": "Loading..."
+ "location": "Location"
}
\ No newline at end of file
diff --git a/deployment/manager/shared/locales/nl/or.json b/deployment/manager/shared/locales/nl/or.json
index 61809d73a..04deb6d1c 100644
--- a/deployment/manager/shared/locales/nl/or.json
+++ b/deployment/manager/shared/locales/nl/or.json
@@ -79,4 +79,5 @@
"showOnMap": "Tonen op kaart",
"noAssetSelected": "Kies aan de linkerkant een asset uit de lijst",
"loading": "Aan het laden..."
+ "location": "Locatie"
}
\ 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 2fe7339f3..8b64d5ccb 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
@@ -24,12 +24,12 @@ import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebResource;
import org.openremote.model.asset.Asset;
-import org.openremote.model.datapoint.AssetDatapointResource;
import org.openremote.model.asset.AssetAttribute;
-import org.openremote.model.datapoint.Datapoint;
+import org.openremote.model.datapoint.AssetDatapointResource;
import org.openremote.model.datapoint.DatapointInterval;
-import org.openremote.model.datapoint.NumberDatapoint;
+import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.http.RequestParams;
+import org.openremote.model.value.Value;
import javax.ws.rs.BeanParam;
import javax.ws.rs.WebApplicationException;
@@ -53,7 +53,7 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
}
@Override
- public NumberDatapoint[] getNumberDatapoints(@BeanParam RequestParams requestParams,
+ public ValueDatapoint<Value>[] getDatapoints(@BeanParam RequestParams requestParams,
String assetId,
String attributeName,
DatapointInterval interval,
@@ -79,11 +79,7 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
new WebApplicationException(Response.Status.NOT_FOUND)
);
- if (!Datapoint.isDatapointsCapable(attribute) || !attribute.isStoreDatapoints()) {
- throw new WebApplicationException(Response.Status.BAD_REQUEST);
- }
-
- return assetDatapointService.aggregateDatapoints(
+ return assetDatapointService.getValueDatapoints(
attribute,
interval,
timestamp
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 e97c3bb88..ed9a64807 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
@@ -14,29 +14,31 @@ import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebService;
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.AttributeRef;
+import org.openremote.model.attribute.MetaItemType;
import org.openremote.model.datapoint.AssetDatapoint;
-import org.openremote.model.datapoint.Datapoint;
import org.openremote.model.datapoint.DatapointInterval;
-import org.openremote.model.datapoint.NumberDatapoint;
+import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.filter.AttributeMetaPredicate;
+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;
-import java.sql.*;
-import java.text.SimpleDateFormat;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledFuture;
-import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@@ -118,8 +120,7 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
Asset asset,
AssetAttribute attribute,
Source source) throws AssetProcessingException {
- if (Datapoint.isDatapointsCapable(attribute)
- && attribute.isStoreDatapoints()
+ if (attribute.isStoreDatapoints()
&& attribute.getStateEvent().isPresent()
&& attribute.getStateEvent().get().getValue().isPresent()) { // Don't store datapoints with null value
LOG.finest("Storing datapoint for: " + attribute);
@@ -168,63 +169,61 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
});
}
- public NumberDatapoint[] aggregateDatapoints(AssetAttribute attribute,
- DatapointInterval datapointInterval,
- long timestamp) {
- LOG.fine("Aggregating datapoints for: " + attribute);
+ public ValueDatapoint[] getValueDatapoints(AssetAttribute attribute,
+ DatapointInterval datapointInterval,
+ long timestamp) {
AttributeRef attributeRef = attribute.getReferenceOrThrow();
+ ValueType attributeValueType = attribute.getTypeOrThrow().getValueType();
+
+ LOG.fine("Getting datapoints for: " + attributeRef);
return persistenceService.doReturningTransaction(entityManager ->
- entityManager.unwrap(Session.class).doReturningWork(new AbstractReturningWork<NumberDatapoint[]>() {
+ entityManager.unwrap(Session.class).doReturningWork(new AbstractReturningWork<ValueDatapoint[]>() {
@Override
- public NumberDatapoint[] execute(Connection connection) throws SQLException {
+ public ValueDatapoint[] execute(Connection connection) throws SQLException {
String truncateX;
String step;
String interval;
- Function<Timestamp, String> labelFunction;
- SimpleDateFormat dayFormat = new SimpleDateFormat("dd. MMM yyyy");
- SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm");
switch (datapointInterval) {
case HOUR:
truncateX = "minute";
step = "1 minute";
interval = "1 hour";
- labelFunction = timeFormat::format;
break;
case DAY:
truncateX = "hour";
step = "1 hour";
interval = "1 day";
- labelFunction = timeFormat::format;
break;
case WEEK:
truncateX = "day";
step = "1 day";
interval = "7 day";
- labelFunction = dayFormat::format;
break;
case MONTH:
truncateX = "day";
step = "1 day";
interval = "1 month";
- labelFunction = dayFormat::format;
break;
case YEAR:
truncateX = "month";
step = "1 month";
interval = "1 year";
- labelFunction = dayFormat::format;
break;
default:
throw new IllegalArgumentException("Can't handle interval: " + datapointInterval);
}
StringBuilder query = new StringBuilder();
+ boolean downsample = attributeValueType == ValueType.NUMBER || attributeValueType == ValueType.BOOLEAN;
- query.append("select TS as X, coalesce(AVG_VALUE, null) as Y " +
+ 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 " +
@@ -233,18 +232,13 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
" select " +
" date_trunc(?, to_timestamp(TIMESTAMP / 1000))::timestamp as TS, ");
- switch (attribute.getTypeOrThrow().getValueType()) {
- case NUMBER:
+ if (attributeValueType == ValueType.NUMBER) {
query.append(" AVG(VALUE::text::numeric) as AVG_VALUE ");
- break;
- case BOOLEAN:
+ } else {
query.append(" AVG(case when VALUE::text::boolean is true then 1 else 0 end) as AVG_VALUE ");
- break;
- default:
- throw new IllegalArgumentException("Can't aggregate number datapoints for type of: " + attribute);
- }
+ }
- query.append(" from ASSET_DATAPOINT " +
+ query.append(" from ASSET_DATAPOINT " +
" where " +
" to_timestamp(TIMESTAMP / 1000) >= to_timestamp(?) - ? " +
" and " +
@@ -254,31 +248,48 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
" group by TS " +
" ) DP using (TS) " +
" order by TS asc "
- );
+ );
+ } else {
+ query.append("select distinct to_timestamp(TIMESTAMP / 1000) AS X, value AS Y from ASSET_DATAPOINT " +
+ "where " +
+ "to_timestamp(TIMESTAMP / 1000) >= to_timestamp(?) - ? " +
+ "and " +
+ "to_timestamp(TIMESTAMP / 1000) <= to_timestamp(?) " +
+ "and " +
+ "ENTITY_ID = ? and ATTRIBUTE_NAME = ? "
+ );
+ }
try (PreparedStatement st = connection.prepareStatement(query.toString())) {
long timestampSeconds = timestamp / 1000;
- 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());
+ 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());
+ } 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());
+ }
try (ResultSet rs = st.executeQuery()) {
- List<NumberDatapoint> result = new ArrayList<>();
+ List<ValueDatapoint<?>> result = new ArrayList<>();
while (rs.next()) {
- String label = labelFunction.apply(rs.getTimestamp(1));
- Number value = rs.getObject(2) != null ? rs.getDouble(2) : null;
- result.add(new NumberDatapoint(label, value));
+ 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 NumberDatapoint[result.size()]);
+ return result.toArray(new ValueDatapoint[result.size()]);
}
}
}
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 1a10c7133..799ef3a1a 100644
--- a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
+++ b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
@@ -20,10 +20,9 @@
package org.openremote.model.datapoint;
import jsinterop.annotations.JsType;
-import org.openremote.model.datapoint.DatapointInterval;
-import org.openremote.model.datapoint.NumberDatapoint;
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.*;
@@ -39,8 +38,7 @@ public interface AssetDatapointResource {
* 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
- * not have datapoint storage enabled or is not capable of historical datapoints
- * (see {@link org.openremote.model.datapoint.Datapoint#isDatapointsCapable}).
+ * not have datapoint storage enabled.
*/
@GET
@Path("{assetId}/attribute/{attributeName}")
@@ -48,7 +46,7 @@ public interface AssetDatapointResource {
@SuccessStatusCode(200)
@RolesAllowed({"read:assets"})
@SuppressWarnings("unusable-by-js")
- NumberDatapoint[] getNumberDatapoints(@BeanParam RequestParams requestParams,
+ ValueDatapoint<Value>[] getDatapoints(@BeanParam RequestParams requestParams,
@PathParam("assetId") String assetId,
@PathParam("attributeName") String attributeName,
@QueryParam("interval") DatapointInterval datapointInterval,
diff --git a/model/src/main/java/org/openremote/model/datapoint/Datapoint.java b/model/src/main/java/org/openremote/model/datapoint/Datapoint.java
index 01fc87b58..5bb8a2375 100644
--- a/model/src/main/java/org/openremote/model/datapoint/Datapoint.java
+++ b/model/src/main/java/org/openremote/model/datapoint/Datapoint.java
@@ -19,9 +19,10 @@
*/
package org.openremote.model.datapoint;
-import org.openremote.model.attribute.*;
+import org.openremote.model.attribute.AttributeEvent;
+import org.openremote.model.attribute.AttributeRef;
+import org.openremote.model.attribute.AttributeState;
import org.openremote.model.value.Value;
-import org.openremote.model.value.ValueType;
import javax.persistence.Column;
import javax.persistence.Id;
@@ -40,23 +41,6 @@ import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;
@IdClass(Datapoint.class)
public abstract class Datapoint implements Serializable {
- /**
- * @return <code>true</code> if datapoints can be stored and analyzed/displayed for the given value type.
- */
- public static boolean isDatapointsCapable(ValueType valueType) {
- switch (valueType) {
- case NUMBER:
- case BOOLEAN:
- return true;
- default:
- return false;
- }
- }
-
- public static boolean isDatapointsCapable(Attribute attribute) {
- return attribute.getType().map(attributeType -> isDatapointsCapable(attributeType.getValueType())).orElse(false);
- }
-
@Id
@Column(name = "ENTITY_ID", length = 36, nullable = false)
protected String entityId;
diff --git a/model/src/main/java/org/openremote/model/datapoint/NumberDatapoint.java b/model/src/main/java/org/openremote/model/datapoint/ValueDatapoint.java
similarity index 58%
rename from model/src/main/java/org/openremote/model/datapoint/NumberDatapoint.java
rename to model/src/main/java/org/openremote/model/datapoint/ValueDatapoint.java
index 8c6d953e7..36b6599ce 100644
--- a/model/src/main/java/org/openremote/model/datapoint/NumberDatapoint.java
+++ b/model/src/main/java/org/openremote/model/datapoint/ValueDatapoint.java
@@ -19,40 +19,40 @@
*/
package org.openremote.model.datapoint;
-public class NumberDatapoint {
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.openremote.model.value.Value;
- protected String label;
- protected Number number;
+public class ValueDatapoint<T extends Value> {
- protected NumberDatapoint() {
- }
-
- public NumberDatapoint(String label, Number number) {
- this.label = label;
- this.number = number;
- }
+ protected long timestamp;
+ protected T value;
- public String getLabel() {
- return label;
+ protected ValueDatapoint() {
}
- public void setLabel(String label) {
- this.label = label;
+ @JsonCreator
+ public ValueDatapoint(@JsonProperty("x") long timestamp,
+ @JsonProperty("y") T value) {
+ this.timestamp = timestamp;
+ this.value = value;
}
- public Number getNumber() {
- return number;
+ @JsonProperty("x")
+ public long getTimestamp() {
+ return timestamp;
}
- public void setNumber(Number number) {
- this.number = number;
+ @JsonProperty("y")
+ public T getValue() {
+ return value;
}
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
- "label='" + label + '\'' +
- ", number=" + number +
+ "timestamp='" + timestamp + '\'' +
+ ", value=" + value +
'}';
}
}
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy
index 8d1903768..87f9fac55 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetDatapointTest.groovy
@@ -105,7 +105,7 @@ class AssetDatapointTest extends Specification implements ManagerContainerTrait
and: "the aggregated datapoints should match"
conditions.eventually {
def thing = assetStorageService.find(managerDemoSetup.thingId, true)
- def aggregatedDatapoints = assetDatapointService.aggregateDatapoints(
+ def aggregatedDatapoints = assetDatapointService.getValueDatapoints(
thing.getAttribute("light1PowerConsumption").orElseThrow({ new RuntimeException("Missing attribute")}),
DatapointInterval.HOUR,
getClockTimeOf(container)
@@ -168,7 +168,7 @@ class AssetDatapointTest extends Specification implements ManagerContainerTrait
and: "the aggregated datapoints should match"
conditions.eventually {
def thing = assetStorageService.find(managerDemoSetup.thingId, true)
- def aggregatedDatapoints = assetDatapointService.aggregateDatapoints(
+ def aggregatedDatapoints = assetDatapointService.getValueDatapoints(
thing.getAttribute(thingLightToggleAttributeName).orElseThrow({ new RuntimeException("Missing attribute")}),
DatapointInterval.HOUR,
getClockTimeOf(container)
diff --git a/ui/component/or-input/src/index.ts b/ui/component/or-input/src/index.ts
index 8c89b745b..b68d18e9e 100644
--- a/ui/component/or-input/src/index.ts
+++ b/ui/component/or-input/src/index.ts
@@ -12,7 +12,7 @@ import {MDCFormField, MDCFormFieldInput} from "@material/form-field";
import {OrSelectChangedEvent} from "@openremote/or-select";
// TODO: Add webpack/rollup to build so consumers aren't forced to use the same tooling
-const buttonStyle = require("@material/button/dist/mdc.button.css");
+const buttonStyle = require("!!raw-loader!@material/button/dist/mdc.button.css");
const iconButtonStyle = require("!!raw-loader!@material/icon-button/dist/mdc.icon-button.css");
const textfieldStyle = require("!!raw-loader!@material/textfield/dist/mdc.textfield.css");
const rippleStyle = require("!!raw-loader!@material/ripple/dist/mdc.ripple.css");
diff --git a/ui/component/or-panel/.npmignore b/ui/component/or-panel/.npmignore
new file mode 100644
index 000000000..ca658009d
--- /dev/null
+++ b/ui/component/or-panel/.npmignore
@@ -0,0 +1,3 @@
+build/
+build.gradle
+test/
\ No newline at end of file
diff --git a/ui/component/or-panel/README.md b/ui/component/or-panel/README.md
new file mode 100644
index 000000000..228cb53c5
--- /dev/null
+++ b/ui/component/or-panel/README.md
@@ -0,0 +1,31 @@
+# @openremote/or-panel \<or-panel\>
+[![NPM Version][npm-image]][npm-url]
+[![Linux Build][travis-image]][travis-url]
+[![Test Coverage][coveralls-image]][coveralls-url]
+
+Web Component for displaying a scrollable panel based on simplebar.
+
+## Install
+```bash
+npm i @openremote/or-panel
+yarn add @openremote/or-panel
+```
+
+## Usage
+For a full list of properties, methods and options refer to the TypeDoc generated [documentation]().
+
+
+## Supported Browsers
+The last 2 versions of all modern browsers are supported, including Chrome, Safari, Opera, Firefox, Edge. In addition,
+Internet Explorer 11 is also supported.
+
+
+## License
+[GNU AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html)
+
+[npm-image]: https://img.shields.io/npm/v/live-xxx.svg
+[npm-url]: https://npmjs.org/package/@openremote/or-input
+[travis-image]: https://img.shields.io/travis/live-js/live-xxx/master.svg
+[travis-url]: https://travis-ci.org/live-js/live-xxx
+[coveralls-image]: https://img.shields.io/coveralls/live-js/live-xxx/master.svg
+[coveralls-url]: https://coveralls.io/r/live-js/live-xxx?branch=master
diff --git a/ui/component/or-panel/build.gradle b/ui/component/or-panel/build.gradle
new file mode 100644
index 000000000..c08de8a80
--- /dev/null
+++ b/ui/component/or-panel/build.gradle
@@ -0,0 +1,11 @@
+buildDir = "dist"
+
+task clean() {
+ doLast {
+ delete "dist"
+ }
+}
+
+task build() {
+ dependsOn npmBuild
+}
\ No newline at end of file
diff --git a/ui/component/or-panel/package.json b/ui/component/or-panel/package.json
new file mode 100644
index 000000000..466985897
--- /dev/null
+++ b/ui/component/or-panel/package.json
@@ -0,0 +1,22 @@
+{
+ "name": "@openremote/or-panel",
+ "version": "1.0.0",
+ "description": "OpenRemote scrollable panel with custom scrollbars based on simplebar",
+ "main": "dist/index.js",
+ "types": "src/index.ts",
+ "scripts": {
+ "build": "npx tsc",
+ "test": "echo \"No tests\" && exit 0"
+ },
+ "author": "OpenRemote",
+ "license": "AGPL-3.0-or-later",
+ "dependencies": {
+ "lit-element": "^2.2.1",
+ "@types/simplebar": "^2.4.2",
+ "simplebar": "^4.2.3"
+ },
+ "devDependencies": {
+ "tslint": "^5.11.0",
+ "typescript": "^3.4.5"
+ }
+}
diff --git a/ui/component/or-asset-viewer/src/components/or-panel.ts b/ui/component/or-panel/src/index.ts
similarity index 92%
rename from ui/component/or-asset-viewer/src/components/or-panel.ts
rename to ui/component/or-panel/src/index.ts
index 2ac7bfb34..3db662b6e 100644
--- a/ui/component/or-asset-viewer/src/components/or-panel.ts
+++ b/ui/component/or-panel/src/index.ts
@@ -1,7 +1,4 @@
import {css, customElement, html, LitElement, PropertyValues, query, unsafeCSS, property} from "lit-element";
-import "@openremote/or-select";
-import "@openremote/or-icon";
-import "@openremote/or-translate";
import SimpleBar from "simplebar";
// TODO: Add webpack/rollup to build so consumers aren't forced to use the same tooling
diff --git a/ui/component/or-panel/tsconfig.json b/ui/component/or-panel/tsconfig.json
new file mode 100644
index 000000000..1e51a2601
--- /dev/null
+++ b/ui/component/or-panel/tsconfig.json
@@ -0,0 +1,16 @@
+{
+ "extends": "../../tsconfig",
+ "compilerOptions": {
+ "outDir": "./dist",
+ "tsBuildInfoFile": "./dist/.tsbuildinfo",
+ "rootDir": "src"
+ },
+ "include": [
+ "./src"
+ ],
+ "references": [
+ { "path": "../core" },
+ { "path": "../rest" },
+ { "path": "../or-icon" }
+ ]
+}
\ No newline at end of file