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

bug fixes

Browse source 
Former-commit-id: 5070493832b19151a693d7f8586fa9c9323de477
This commit is contained in:
dcollin 2015-12-04 10:33:27 +01:00
parent 1949d11f99
commit 79468d8e0d
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/se/koc/hal/PowerChallenge.java
View file

@ -2,6 +2,7 @@ package se.koc.hal;
import se.koc.hal.deamon.DataAggregatorDaemon; import se.koc.hal.deamon.DataAggregatorDaemon;
import se.koc.hal.deamon.DataSynchronizationClient;
import se.koc.hal.deamon.DataSynchronizationDaemon; import se.koc.hal.deamon.DataSynchronizationDaemon;
import se.koc.hal.deamon.HalDaemon; import se.koc.hal.deamon.HalDaemon;
import se.koc.hal.page.PCConfigureHttpPage; import se.koc.hal.page.PCConfigureHttpPage;
@ -24,7 +25,8 @@ public class PowerChallenge {
private static HalDaemon[] daemons = new HalDaemon[]{ private static HalDaemon[] daemons = new HalDaemon[]{
new DataAggregatorDaemon(), new DataAggregatorDaemon(),
new DataSynchronizationDaemon() new DataSynchronizationDaemon(),
new DataSynchronizationClient()
}; };
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {

9
src/se/koc/hal/deamon/DataSynchronizationClient.java
View file

@ -56,7 +56,8 @@ public class DataSynchronizationClient extends TimerTask implements HalDaemon{
SensorDataListDTO dataList = (SensorDataListDTO) in.readObject(); SensorDataListDTO dataList = (SensorDataListDTO) in.readObject();
for(SensorDataDTO data : dataList){ for(SensorDataDTO data : dataList){
int deletions = db.exec("DELETE FROM sensor_data_aggr WHERE sensor_id == "+ sensor.getId() +" AND "+ data.timestampStart +" <= timestamp_start AND timestamp_end <= "+ data.timestampEnd); int deletions = db.exec("DELETE FROM sensor_data_aggr WHERE sensor_id == "+ sensor.getId() +" AND "+ data.timestampStart +" <= timestamp_start AND timestamp_end <= "+ data.timestampEnd);
logger.finer("Aggregate data replaced "+ deletions +" entries"); if(deletions > 0)
logger.finer("Aggregate data replaced "+ deletions +" entries");
db.exec(String.format(Locale.US, "INSERT INTO sensor_data_aggr(sensor_id, sequence_id, timestamp_start, timestamp_end, data, confidence) VALUES(%d, %d, %d, %d, %d, %f)", db.exec(String.format(Locale.US, "INSERT INTO sensor_data_aggr(sensor_id, sequence_id, timestamp_start, timestamp_end, data, confidence) VALUES(%d, %d, %d, %d, %d, %f)",
sensor.getId(), sensor.getId(),
data.sequenceId, data.sequenceId,
@ -66,6 +67,10 @@ public class DataSynchronizationClient extends TimerTask implements HalDaemon{
data.confidence)); data.confidence));
} }
} }
out.writeObject(null);
out.close();
in.close();
s.close();
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
e.printStackTrace(); e.printStackTrace();
@ -84,7 +89,7 @@ public class DataSynchronizationClient extends TimerTask implements HalDaemon{
/////////////// DTO /////////////////////// /////////////// DTO ///////////////////////
protected class PeerDataReqDTO implements Serializable{ protected static class PeerDataReqDTO implements Serializable{
private static final long serialVersionUID = -9066734025245139989L; private static final long serialVersionUID = -9066734025245139989L;
public long sensorId; public long sensorId;

4
src/se/koc/hal/deamon/DataSynchronizationDaemon.java
View file

@ -99,11 +99,11 @@ public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implemen
} }
/////////////// DTO /////////////////////// /////////////// DTO ///////////////////////
protected class SensorDataListDTO extends ArrayList<SensorDataDTO> implements Serializable{ protected static class SensorDataListDTO extends ArrayList<SensorDataDTO> implements Serializable{
private static final long serialVersionUID = -5701618637734020691L; private static final long serialVersionUID = -5701618637734020691L;
} }
protected class SensorDataDTO implements Serializable{ protected static class SensorDataDTO implements Serializable{
private static final long serialVersionUID = 8494331502087736809L; private static final long serialVersionUID = 8494331502087736809L;
public long sequenceId; public long sequenceId;