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

bugfix, updated sensor column

Browse source
This commit is contained in:
Ziver Koc 2016-08-25 22:45:11 +02:00
parent 889f9fc85f
commit 197d554bee
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/se/hal/struct/Event.java
View file

@ -50,7 +50,7 @@ public class Event extends AbstractDevice<HalEventConfig,HalEventData>{
try { try {
Class deviceDataClass = getDeviceConfig().getEventDataClass(); Class deviceDataClass = getDeviceConfig().getEventDataClass();
if (deviceDataClass == null) if (deviceDataClass == null)
throw new ClassNotFoundException("Unknown device data class for: " + getDeviceConfig().getClass()); throw new ClassNotFoundException("Unknown event data class for: " + getDeviceConfig().getClass());
PreparedStatement stmt = db.getPreparedStatement( PreparedStatement stmt = db.getPreparedStatement(
"SELECT data FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT 1"); "SELECT data FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT 1");

4
src/se/hal/struct/Sensor.java
View file

@ -119,10 +119,10 @@ public class Sensor extends AbstractDevice<HalSensorConfig,HalSensorData>{
try { try {
Class deviceDataClass = getDeviceConfig().getSensorDataClass(); Class deviceDataClass = getDeviceConfig().getSensorDataClass();
if (deviceDataClass == null) if (deviceDataClass == null)
throw new ClassNotFoundException("Unknown device data class for: " + getDeviceConfig().getClass()); throw new ClassNotFoundException("Unknown sensor data class for: " + getDeviceConfig().getClass());
PreparedStatement stmt = db.getPreparedStatement( PreparedStatement stmt = db.getPreparedStatement(
"SELECT data FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC LIMIT 1"); "SELECT data FROM sensor_data_raw WHERE sensor_id == ? ORDER BY timestamp DESC LIMIT 1");
stmt.setLong(1, getId()); stmt.setLong(1, getId());
return (HalSensorData) return (HalSensorData)
DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass)); DBConnection.exec(stmt, new DeviceDataSqlResult(deviceDataClass));