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
Minor bug fix for datapoint retrieval
Rich Turner768bdf5321dc
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.javaindex c63983983..d16e7a157 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java@@ -314,7 +314,18 @@ public abstract class AbstractDatapointService<T extends Datapoint> implements Ctry (ResultSet rs = st.executeQuery()) {List<ValueDatapoint<?>> result = new ArrayList<>();while (rs.next()) {- Object value = rs.getObject(2) != null ? isNumber ? Values.getValueCoerced(rs.getObject(2), Double.class).orElse(null) : rs.getObject(2) instanceof PGobject ? Values.parse(((PGobject)rs.getObject(2)).getValue()).orElse(null) : Values.getValueCoerced(rs.getObject(2), JsonNode.class).orElse(null) : null;+ Object value = null;+ if (rs.getObject(2) != null) {+ if (downsample) {+ value = Values.getValueCoerced(rs.getObject(2), Double.class).orElse(null);+ } else {+ if (rs.getObject(2) instanceof PGobject) {+ value = Values.parse(((PGobject)rs.getObject(2)).getValue()).orElse(null);+ } else {+ value = Values.getValueCoerced(rs.getObject(2), JsonNode.class).orElse(null);+ }+ }+ }result.add(new ValueDatapoint<>(rs.getTimestamp(1).getTime(), value));}return result.toArray(new ValueDatapoint<?>[0]);