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

Some bug fixes

Browse source 
Former-commit-id: d282235d58ecb970ef1a7190ccaa592f097e1499
This commit is contained in:
Ziver Koc 2015-12-04 10:33:22 +01:00
parent 1949d11f99
commit c99cedb2ad
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
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 {
@ -41,11 +43,11 @@ public class PowerChallenge {
daemon.initiate(daemonTimer); daemon.initiate(daemonTimer);
} }
HttpServer http = new HttpServer(80); /*HttpServer http = new HttpServer(80);
http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/"))); http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/")));
http.setPage("/", new PCOverviewHttpPage()); http.setPage("/", new PCOverviewHttpPage());
http.setPage("/configure", new PCConfigureHttpPage()); http.setPage("/configure", new PCConfigureHttpPage());
http.setPage("/heatmap", new PCHeatMapHttpPage()); http.setPage("/heatmap", new PCHeatMapHttpPage());
http.start(); http.start();*/
} }
} }

2
src/se/koc/hal/deamon/DataSynchronizationClient.java Normal file → Executable file
View file

@ -84,7 +84,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;

10
src/se/koc/hal/deamon/DataSynchronizationDaemon.java Normal file → Executable file
View file

@ -21,7 +21,8 @@ import zutil.net.threaded.ThreadedTCPNetworkServerThread;
public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon{ public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon{
private static final Logger logger = LogUtil.getLogger(); private static final Logger logger = LogUtil.getLogger();
public static final int SERVER_PORT = 6666; //public static final int SERVER_PORT = 6666;
public static final int SERVER_PORT = 80;
public DataSynchronizationDaemon() { public DataSynchronizationDaemon() {
@ -88,6 +89,9 @@ public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implemen
out.writeObject(list); out.writeObject(list);
} }
} }
out.close();
in.close();
s.close();
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} catch (IOException e) { } catch (IOException e) {
@ -99,11 +103,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;

2
test/se/koc/hal/plugin/tellstick/TelstickSerialCommTest.java
View file

@ -35,7 +35,7 @@ public class TelstickSerialCommTest {
try { try {
db.exec("INSERT INTO sensor_data_raw (timestamp, sensor_id, data) VALUES("+ db.exec("INSERT INTO sensor_data_raw (timestamp, sensor_id, data) VALUES("+
System.currentTimeMillis() + "," + System.currentTimeMillis() + "," +
"0," + "1," +
(int)((Oregon0x1A2D)protocol).getTemperature() (int)((Oregon0x1A2D)protocol).getTemperature()
+")"); +")");
} catch (SQLException e) { } catch (SQLException e) {