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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lukas-heiligenbrunner 2019-12-06 12:24:58 +01:00
commit f132ca9602
5 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/misc.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="13" project-jdk-type="JavaSDK">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

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

@ -35,6 +35,7 @@ public class main {
}
}).start();
//startup web server
Thread mythread = new Thread(() -> new Webserver().startserver());
mythread.start();
@ -46,9 +47,7 @@ public class main {
mqtt m = new mqtt();
m.notifymessage();
} catch (Exception e) {
e.printStackTrace();
}
Log.debug("An error was happened in the class mqtt");
}
}
}

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

@ -33,7 +33,7 @@ public class mqtt {
client.connect(connOpts);
} catch (MqttException e) {
e.printStackTrace();
Log.error("Connection to the ESB was failes");
}
mqttreceiver mr = new mqttreceiver(client);
@ -56,7 +56,7 @@ public class mqtt {
try {
Database = JDCB.getInstance();
} catch (IOException e) {
//e.printStackTrace();
Log.error("No Connection to the databank");
}
//new JDCB("placeuser", "eaL956R6yFItQVBl", "wasteinformation");
ResultSet result = Database.executeQuery(message);
@ -92,8 +92,7 @@ public class mqtt {
}
}
} catch (SQLException e) {
System.out.println("Exception");
e.printStackTrace();
Log.error("No data from databank");
}
}
@ -120,8 +119,5 @@ public class mqtt {
String split[] = temp.split("/");
String newDate = split[2] + "." + split[1] + "." + split[0];
return newDate;
}
}

2
src/java/com/wasteinformationserver/mqtt/mqttreceiver.java
View File

@ -45,7 +45,7 @@ Log.error("connection lost");
client.subscribe("TopicIn");
Log.debug("subscribed topic");
} catch (MqttException e) {
e.printStackTrace();
Log.error("Connection to the ESB was failed");
}
return message;
}

1
src/java/com/wasteinformationserver/mqtt/mqtttransmitter.java
View File

@ -36,7 +36,6 @@ public class mqtttransmitter {
Log.debug("loc " + me.getLocalizedMessage());
Log.debug("cause " + me.getCause());
Log.debug("excep " + me);
me.printStackTrace();
}
}
}