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

readymqtt

Browse Source
This commit is contained in:
Gregor_Dutzler 2019-12-13 13:55:32 +01:00
parent e4f9d88cda
commit 89426cfcee
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/wasteinformationserver/main.java
View File

@ -5,6 +5,7 @@ import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.db.JDCB; import com.wasteinformationserver.db.JDCB;
import com.wasteinformationserver.mqtt.mqtt; import com.wasteinformationserver.mqtt.mqtt;
import com.wasteinformationserver.website.Webserver; import com.wasteinformationserver.website.Webserver;
import java.io.IOException; import java.io.IOException;
public class main { public class main {
@ -26,8 +27,8 @@ public class main {
})); }));
Info.init(); Info.init();
Log.info("Server version: "+Info.getVersion()); Log.info("Server version: " + Info.getVersion());
Log.debug("Build date: "+Info.getBuilddate()); Log.debug("Build date: " + Info.getBuilddate());
//initial connect to db //initial connect to db
Log.message("initial login to db"); Log.message("initial login to db");

50
src/java/com/wasteinformationserver/mqtt/mqtt.java
View File

@ -44,7 +44,6 @@ public class mqtt {
String[] split = temp.split(","); String[] split = temp.split(",");
String wastetyp = getTyp(Integer.parseInt(split[2])); String wastetyp = getTyp(Integer.parseInt(split[2]));
System.out.println(wastetyp);
getDatabasedata("SELECT pickupdates.pickupdate FROM pickupdates WHERE pickupdates.citywastezoneid=(SELECT cities.zone FROM cities WHERE cities.name='" + split[1] + "' AND cities.wastetype='" + wastetyp + "' AND cities.zone=" + split[3] + ")", wastetyp, Integer.parseInt(split[0])); getDatabasedata("SELECT pickupdates.pickupdate FROM pickupdates WHERE pickupdates.citywastezoneid=(SELECT cities.zone FROM cities WHERE cities.name='" + split[1] + "' AND cities.wastetype='" + wastetyp + "' AND cities.zone=" + split[3] + ")", wastetyp, Integer.parseInt(split[0]));
} }
}); });
@ -53,7 +52,6 @@ public class mqtt {
public void getDatabasedata(String message, String wastetyp, int clientidentify) { public void getDatabasedata(String message, String wastetyp, int clientidentify) {
System.out.println("message");
Log.debug(message); Log.debug(message);
Log.debug(wastetyp); Log.debug(wastetyp);
Log.debug(clientidentify); Log.debug(clientidentify);
@ -64,35 +62,29 @@ public class mqtt {
Log.error("No Connection to the databank"); Log.error("No Connection to the databank");
} }
int wastenumber = getIntTyp(wastetyp); int wastenumber = getIntTyp(wastetyp);
System.out.println("wastenumber" + wastenumber);
//new JDCB("placeuser", "eaL956R6yFItQVBl", "wasteinformation"); //new JDCB("placeuser", "eaL956R6yFItQVBl", "wasteinformation");
ResultSet result = Database.executeQuery(message); ResultSet result = Database.executeQuery(message);
try { try {
while (result.next()) { while (result.next()) {
String temptime = String.valueOf(result.getString("pickupdate")); String temptime = String.valueOf(result.getString("pickupdate"));
GregorianCalendar now = new GregorianCalendar();
DateFormat df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG);
String date = df.format(now.getTime());
String[] parts = temptime.split("-");
String tempyear = parts[0];
String[] yearsplit = tempyear.split("0");
String tempyearnew = yearsplit[1];
String newDate = parts[2] + "." + parts[1] + ".20" + tempyearnew;
String[] partstwo = date.split(" ");
String Datetomorrow = nexDayDate();
int abholtag; String newDate = getDate(temptime);
if (partstwo[0].equals(newDate) || partstwo[0].equals(Datetomorrow)) { GregorianCalendar now = new GregorianCalendar();
abholtag = 1; DateFormat df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG);
transmitmessageAbfallart(clientidentify + "," + wastenumber + "," + abholtag); String date = df.format(now.getTime());
} else { String[] partstwo = date.split(",");
abholtag = 0; String Datetomorrow = nexDayDate();
transmitmessageAbfallart(clientidentify + "," + wastenumber + "," + abholtag);
} int abholtag;
if (partstwo[0].equals(newDate) || partstwo[0].equals(Datetomorrow)) {
abholtag = 1;
transmitmessageAbfallart(clientidentify + "," + wastenumber + "," + abholtag);
} else {
abholtag = 0;
transmitmessageAbfallart(clientidentify + "," + wastenumber + "," + abholtag);
} }
}
} catch (SQLException e) { } catch (SQLException e) {
Log.error("No data from database"); Log.error("No data from database");
} }
@ -148,4 +140,14 @@ public class mqtt {
} }
return number; return number;
} }
private String getDate(String temptime) {
GregorianCalendar now = new GregorianCalendar();
DateFormat df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG);
String[] parts = temptime.split("-");
String tempyear = parts[0];
String[] yearsplit = tempyear.split("0");
String tempyearnew = yearsplit[1];
return parts[2] + "." + parts[1] + "." + tempyearnew;
}
} }