School/WasteInformationServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* added some todos

Browse Source
This commit is contained in:
lukas-heiligenbrunner
2020-01-12 14:05:28 +01:00
parent c3fb92d6eb
commit ac02e4bd62
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/com/wasteinformationserver/db/MySQLConnector.java
View File

@@ -19,7 +19,7 @@ public class MySQLConnector extends Database {
}
public Connection getConnection() throws SQLException {
DriverManager.setLoginTimeout(1); // TODO: 30.11.19 set higher maybe
DriverManager.setLoginTimeout(1);
return DriverManager.getConnection(
"jdbc:mysql://" + host + ":" + port + "/" + dbName + "?useSSL=false",
user,

4
src/java/com/wasteinformationserver/mqtt/MqttService.java
View File

@@ -43,7 +43,7 @@ public class MqttService {
@Override
public void messageArrived(String s, MqttMessage mqttMessage) {
String message = new String(mqttMessage.getPayload());
Log.info("received Request from PCB");
Log.message("received Request from PCB");
ResultSet res = db.executeQuery("SELECT * from devices WHERE DeviceID=" + message);
try {
@@ -61,6 +61,7 @@ public class MqttService {
} else {
//new device
db.executeUpdate("INSERT INTO devices (DeviceID) VALUES (" + message + ")");
Log.info("new device registered to server");
tramsmitMessage(message + ",-1");
}
} catch (SQLException e) {
@@ -99,6 +100,7 @@ public class MqttService {
if (timestamp == timestampnow || timestamp == timestampnow + 86400000) { // 86400000 == one day
// valid time
// TODO: 12.01.20 read right waste type from db and replace below
tramsmitMessage(deviceid + "," + "Plastic" + "," + 1);
Log.debug("valid time");
return;