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 functions to update value from rules for AssetPredictedDatapoint
Michael Rademaker011838bb9d60
diff --git a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.javaindex 16b60601b..287da16f0 100644--- a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointResourceImpl.java@@ -78,7 +78,7 @@ public class AssetPredictedDatapointResourceImpl extends ManagerWebResource impl);return assetPredictedDatapointService.getValueDatapoints(- attribute,+ attribute.getReferenceOrThrow(),toTimestamp,fromTimestamp);diff --git a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.javaindex 7a18fc59f..ec17e0e28 100644--- a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java@@ -29,12 +29,12 @@ 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.asset.AssetAttribute;import org.openremote.model.attribute.AttributeRef;import org.openremote.model.datapoint.ValueDatapoint;import org.openremote.model.value.Value;import org.openremote.model.value.Values;+import javax.persistence.EntityManager;import javax.persistence.TypedQuery;import java.sql.Connection;import java.sql.PreparedStatement;@@ -109,12 +109,10 @@ public class AssetPredictedDatapointService implements ContainerService {});}- public ValueDatapoint[] getValueDatapoints(AssetAttribute attribute,+ public ValueDatapoint[] getValueDatapoints(AttributeRef attributeRef,long fromTimestamp,long toTimestamp) {- AttributeRef attributeRef = attribute.getReferenceOrThrow();-LOG.fine("Getting predicted datapoints for: " + attributeRef);return persistenceService.doReturningTransaction(entityManager ->@@ -126,7 +124,7 @@ public class AssetPredictedDatapointService implements ContainerService {query.append("select distinct TIMESTAMP AS X, value AS Y from ASSET_PREDICTED_DATAPOINT " +"where " +- "TIMESTAMP >= to_timestamp(?) - ? " ++ "TIMESTAMP >= to_timestamp(?) " +"and " +"TIMESTAMP < to_timestamp(?) " +"and " +@@ -149,11 +147,29 @@ public class AssetPredictedDatapointService implements ContainerService {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 ValueDatapoint[0]);+ return result.toArray(new ValueDatapoint[result.size()]);}}}}));}++ public void updateValue(AttributeRef attributeRef, Value value, long timestamp) {+ updateValue(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);+ });+ }++ private void upsertValue(EntityManager entityManager, String assetId, String attributeName, Value value, long timestamp) {+ entityManager.createNativeQuery(String.format("INSERT INTO asset_predicted_datapoint (entity_id, attribute_name, value, timestamp) \n" ++ "VALUES ('%1$s', '%2$s', '%3$s', to_timestamp(%4$d))\n" ++ "ON CONFLICT (entity_id, attribute_name, timestamp) DO UPDATE \n" ++ " SET value = excluded.value", assetId, attributeName, value.toJson(), timestamp))+ .executeUpdate();+ }}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 839e37daf..69f9e0fc8 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@@ -21,14 +21,13 @@ package org.openremote.manager.rules.facade;import org.openremote.manager.predicted.AssetPredictedDatapointService;import org.openremote.manager.rules.RulesEngineId;-import org.openremote.model.asset.AssetAttribute;+import org.openremote.model.attribute.AttributeRef;import org.openremote.model.datapoint.ValueDatapoint;import org.openremote.model.rules.PredictedDatapoints;import org.openremote.model.rules.Ruleset;+import org.openremote.model.value.Value;-import java.util.Arrays;import java.util.logging.Logger;-import java.util.stream.Stream;public class PredictedFacade<T extends Ruleset> extends PredictedDatapoints {@@ -43,7 +42,17 @@ public class PredictedFacade<T extends Ruleset> extends PredictedDatapoints {}@Override- public Stream<ValueDatapoint> getValueDataPoints(AssetAttribute attribute, long fromTimestamp, long toTimestamp) {- return Arrays.stream(assetPredictedDatapointService.getValueDatapoints(attribute, fromTimestamp, toTimestamp));+ public ValueDatapoint[] getValueDataPoints(AttributeRef attributeRef, long fromTimestamp, long toTimestamp) {+ return assetPredictedDatapointService.getValueDatapoints(attributeRef, fromTimestamp, toTimestamp);+ }++ @Override+ public void updateValue(String assetId, String attributeName, Value value, long timestamp) {+ assetPredictedDatapointService.updateValue(assetId, attributeName, value, timestamp);+ }++ @Override+ public void updateValue(AttributeRef attributeRef, Value value, long timestamp) {+ updateValue(attributeRef.getEntityId(), attributeRef.getAttributeName(), value, timestamp);}}diff --git a/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.java b/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.javaindex 6f04c2110..f5357f1fb 100644--- a/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.java+++ b/model/src/main/java/org/openremote/model/rules/PredictedDatapoints.java@@ -19,14 +19,17 @@*/package org.openremote.model.rules;-import org.openremote.model.asset.AssetAttribute;+import org.openremote.model.attribute.AttributeRef;import org.openremote.model.datapoint.ValueDatapoint;--import java.util.stream.Stream;+import org.openremote.model.value.Value;public abstract class PredictedDatapoints {- public abstract Stream<ValueDatapoint> getValueDataPoints(AssetAttribute attribute,- long fromTimestamp,- long toTimestamp);++ public abstract ValueDatapoint[] getValueDataPoints(AttributeRef attributeRef,+ long fromTimestamp,+ long toTimestamp);++ public abstract void updateValue(String assetId, String attributeName, Value value, long timestamp);+ public abstract void updateValue(AttributeRef attributeRef, Value value, long timestamp);}