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

* style improvements in mqtt

Browse Source
This commit is contained in:
lukas-heiligenbrunner 2020-01-12 11:32:33 +01:00
parent 86dc38a8da
commit 05b15a1ea2
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,14 +34,15 @@ public class MqttService {
} }
@Override @Override
public void messageArrived(String s, MqttMessage mqttMessage) throws Exception { public void messageArrived(String s, MqttMessage mqttMessage) {
String message = new String(mqttMessage.getPayload()); String message = new String(mqttMessage.getPayload());
Log.info("received Request from PCB"); Log.info("received Request from PCB");
Log.debug("received message"); Log.debug("received message");
String[] split = message.split(","); String[] split = message.split(",");
String wastetyp = getTyp(Integer.parseInt(split[2])); String wastetyp = getTyp(Integer.parseInt(split[2]));
getDatabasedata("SELECT pickupdates.pickupdate FROM pickupdates WHERE pickupdates.citywastezoneid=(SELECT cities.id FROM cities WHERE cities.name='" + split[1] + "' AND cities.wastetype='" + wastetyp + "' AND cities.zone=" + split[3] + ")", wastetyp, Integer.parseInt(split[0])); // TODO: 12.01.20 check if id is in db -- save when not
checkDatabase(wastetyp, Integer.parseInt(split[0]), split[1], Integer.parseInt(split[3]));
} }
@Override @Override
@ -55,9 +56,7 @@ public class MqttService {
} }
} }
public void getDatabasedata(String message, String wastetyp, int clientidentify) { public void checkDatabase(String wastetyp, int clientidentify, String cityname, int zone) {
Log.debug(message);
Log.debug(wastetyp); Log.debug(wastetyp);
Log.debug(clientidentify); Log.debug(clientidentify);
@ -69,7 +68,7 @@ public class MqttService {
} }
int wastenumber = getIntTyp(wastetyp); int wastenumber = getIntTyp(wastetyp);
ResultSet result = Database.executeQuery(message); ResultSet result = Database.executeQuery("SELECT pickupdates.pickupdate FROM pickupdates WHERE pickupdates.citywastezoneid=(SELECT cities.id FROM cities WHERE cities.name='" + cityname + "' AND cities.wastetype='" + wastetyp + "' AND cities.zone=" + zone + ")");
try { try {
result.last(); result.last();
if (result.getRow() == 0){ if (result.getRow() == 0){
@ -86,13 +85,11 @@ public class MqttService {
long timestampnow = formatter.parse(formatter.format(new Date())).getTime(); // todo more fancy long timestampnow = formatter.parse(formatter.format(new Date())).getTime(); // todo more fancy
Log.debug("timestamp is :" + timestamp); Log.debug("timestamp is :" + timestamp);
if(timestamp == timestampnow|| timestamp == timestampnow +86400000){ if (timestamp == timestampnow || timestamp == timestampnow + 86400000) { // 86400000 == one day
// valid time // valid time
tramsmitMessage(clientidentify + "," + wastenumber + "," + 1); tramsmitMessage(clientidentify + "," + wastenumber + "," + 1);
Log.debug("valid time"); Log.debug("valid time");
return; return;
}else{
} }
}while(result.next()); }while(result.next());
tramsmitMessage(clientidentify + "," + wastenumber + "," + 0); //transmit zero if not returned before tramsmitMessage(clientidentify + "," + wastenumber + "," + 0); //transmit zero if not returned before
@ -131,14 +128,19 @@ public class MqttService {
private int getIntTyp(String temp) { private int getIntTyp(String temp) {
int number = 0; int number = 0;
if (temp.equals("Plastic")) { switch (temp) {
case "Plastic":
number = 1; number = 1;
} else if (temp.equals("Metal")) { break;
case "Metal":
number = 2; number = 2;
} else if (temp.equals("Residual waste")) { break;
case "Residual waste":
number = 3; number = 3;
} else if (temp.equals("Biowaste")) { break;
case "Biowaste":
number = 4; number = 4;
break;
} }
return number; return number;
} }