ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

SQL bug fix (Overview page still not working)

Browse source 
Former-commit-id: 497a8509c8d199e8d106f3baaa0de357caa922e7
This commit is contained in:
Ziver Koc 2015-12-07 21:49:00 +01:00
parent fdc9183c0c
commit 4370557958
1 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/se/koc/hal/page/PCOverviewHttpPage.java
View file

@ -25,45 +25,45 @@ public class PCOverviewHttpPage implements HttpPage {
try { try {
DBConnection db = HalContext.getDB(); DBConnection db = HalContext.getDB();
ArrayList<PowerData> minDataList = db.exec( ArrayList<PowerData> minDataList = db.exec(
"SELECT user.username as username, " "SELECT user.username as username,"
+ "sensor_data_aggr.timestamp_start as timestamp_start, " + " sensor_data_aggr.timestamp_start as timestamp_start,"
+ "sensor_data_aggr.timestamp_end as timestamp_end , " + " sensor_data_aggr.timestamp_end as timestamp_end,"
+ "sensor_data_aggr.data as data, " + " sensor_data_aggr.data as data,"
+ "sensor_data_aggr.confidence as confidence, " + " sensor_data_aggr.confidence as confidence,"
+ DataAggregatorDaemon.FIVE_MINUTES_IN_MS + " as period_length" + DataAggregatorDaemon.FIVE_MINUTES_IN_MS + " as period_length"
+ "FROM sensor_data_aggr, user, sensor " + " FROM sensor_data_aggr, user, sensor"
+ "WHERE sensor.id = sensor_data_aggr.sensor_id " + " WHERE sensor.id = sensor_data_aggr.sensor_id"
+ "AND user.id = sensor.user_id " + " AND user.id = sensor.user_id"
+ "AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.FIVE_MINUTES_IN_MS-1) + " AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.FIVE_MINUTES_IN_MS-1)
+ "AND timestamp_start > " + (System.currentTimeMillis() - DataAggregatorDaemon.DAY_IN_MS) + " AND timestamp_start > " + (System.currentTimeMillis() - DataAggregatorDaemon.DAY_IN_MS)
+ "ORDER BY timestamp_start ASC", + " ORDER BY timestamp_start ASC",
new SQLPowerDataBuilder()); new SQLPowerDataBuilder());
ArrayList<PowerData> hourDataList = db.exec( ArrayList<PowerData> hourDataList = db.exec(
"SELECT user.username as username, " "SELECT user.username as username,"
+ "sensor_data_aggr.timestamp_start as timestamp_start, " + " sensor_data_aggr.timestamp_start as timestamp_start,"
+ "sensor_data_aggr.timestamp_end as timestamp_end , " + " sensor_data_aggr.timestamp_end as timestamp_end,"
+ "sensor_data_aggr.data as data, " + " sensor_data_aggr.data as data,"
+ "sensor_data_aggr.confidence as confidence, " + " sensor_data_aggr.confidence as confidence,"
+ DataAggregatorDaemon.HOUR_IN_MS + " as period_length" + DataAggregatorDaemon.HOUR_IN_MS + " as period_length"
+ "FROM sensor_data_aggr, user, sensor " + " FROM sensor_data_aggr, user, sensor"
+ "WHERE sensor.id = sensor_data_aggr.sensor_id " + " WHERE sensor.id = sensor_data_aggr.sensor_id"
+ "AND user.id = sensor.user_id " + " AND user.id = sensor.user_id"
+ "AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.HOUR_IN_MS-1) + " AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.HOUR_IN_MS-1)
+ "AND timestamp_start > " + (System.currentTimeMillis() - 3*DataAggregatorDaemon.DAY_IN_MS) + " AND timestamp_start > " + (System.currentTimeMillis() - 3*DataAggregatorDaemon.DAY_IN_MS)
+ "ORDER BY timestamp_start ASC", + " ORDER BY timestamp_start ASC",
new SQLPowerDataBuilder()); new SQLPowerDataBuilder());
ArrayList<PowerData> dayDataList = db.exec( ArrayList<PowerData> dayDataList = db.exec(
"SELECT user.username as username, " "SELECT user.username as username,"
+ "sensor_data_aggr.timestamp_start as timestamp_start, " + " sensor_data_aggr.timestamp_start as timestamp_start,"
+ "sensor_data_aggr.timestamp_end as timestamp_end , " + " sensor_data_aggr.timestamp_end as timestamp_end,"
+ "sensor_data_aggr.data as data, " + " sensor_data_aggr.data as data,"
+ "sensor_data_aggr.confidence as confidence, " + " sensor_data_aggr.confidence as confidence,"
+ DataAggregatorDaemon.DAY_IN_MS + " as period_length" + DataAggregatorDaemon.DAY_IN_MS + " as period_length"
+ "FROM sensor_data_aggr, user, sensor " + " FROM sensor_data_aggr, user, sensor"
+ "WHERE sensor.id = sensor_data_aggr.sensor_id " + " WHERE sensor.id = sensor_data_aggr.sensor_id"
+ "AND user.id = sensor.user_id " + " AND user.id = sensor.user_id"
+ "AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.DAY_IN_MS-1) + " AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.DAY_IN_MS-1)
+ "ORDER BY timestamp_start ASC", + " ORDER BY timestamp_start ASC",
new SQLPowerDataBuilder()); new SQLPowerDataBuilder());