From afca1155533ba4b41450b9a964540c5da79bc253 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 4 Feb 2016 13:24:38 +0100 Subject: [PATCH] small refactoring Former-commit-id: 4294250a28aa0f0c3ed4078ec38ea2a3902c73fb --- .../hal/deamon/SensorDataAggregatorDaemon.java | 2 +- src/se/hal/struct/Sensor.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/se/hal/deamon/SensorDataAggregatorDaemon.java b/src/se/hal/deamon/SensorDataAggregatorDaemon.java index b6a2bbf8..a7c8646f 100755 --- a/src/se/hal/deamon/SensorDataAggregatorDaemon.java +++ b/src/se/hal/deamon/SensorDataAggregatorDaemon.java @@ -67,7 +67,7 @@ public class SensorDataAggregatorDaemon implements HalDaemon { */ private void aggregateRawData(Sensor sensor, long toPeriodSizeInMs, long ageLimitInMs, int expectedSampleCount){ long sensorId = sensor.getId(); - AggregationMethod aggrMethod = sensor.getAggregationMethod(); + AggregationMethod aggrMethod = sensor.getDeviceData().getAggregationMethod(); DBConnection db = HalContext.getDB(); PreparedStatement stmt = null; try { diff --git a/src/se/hal/struct/Sensor.java b/src/se/hal/struct/Sensor.java index c946224b..4f634bb8 100755 --- a/src/se/hal/struct/Sensor.java +++ b/src/se/hal/struct/Sensor.java @@ -85,18 +85,18 @@ public class Sensor extends AbstractDevice{ } - public HalSensorData.AggregationMethod getAggregationMethod(){ - return getDeviceData().getAggregationMethod(); - } - - public Class getController(){ - return getDeviceData().getSensorController(); - } - + /** + * Will clear all aggregated data for this Sensor and increment the AggregationVersion + */ public void clearAggregatedData(DBConnection db) throws SQLException{ PreparedStatement stmt = db.getPreparedStatement( "DELETE FROM sensor_data_aggr WHERE sensor_id == ?" ); stmt.setLong(1, getId()); DBConnection.exec(stmt); + aggr_version++; } + + public Class getController(){ + return getDeviceData().getSensorController(); + } }