diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d79e0..b7148e8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/JavaSample-tcp19216865151883/.lck b/JavaSample-tcp19216865151883/.lck
deleted file mode 100644
index e69de29..0000000
diff --git a/resources/wwwroot/js/settings.js b/resources/wwwroot/js/settings.js
index 3680a3d..3fd4bf7 100644
--- a/resources/wwwroot/js/settings.js
+++ b/resources/wwwroot/js/settings.js
@@ -1,5 +1,5 @@
$(document).ready(function () {
- //check login state
+ // TODO: check login state
console.log("page loaded");
$.post('/senddata/checkloginstate', 'action=getloginstate', function (data) {
console.log(data);
diff --git a/src/com/wasteinformationserver/db/jdcb.java b/src/com/wasteinformationserver/db/JDCB.java
similarity index 92%
rename from src/com/wasteinformationserver/db/jdcb.java
rename to src/com/wasteinformationserver/db/JDCB.java
index 3d73113..2d7766d 100644
--- a/src/com/wasteinformationserver/db/jdcb.java
+++ b/src/com/wasteinformationserver/db/JDCB.java
@@ -7,10 +7,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-public class jdcb {
+public class JDCB {
Connection conn;
- public jdcb(String username, String password, String dbname) {
+ public JDCB(String username, String password, String dbname) {
Database db = new MySQLConnector(
username,
password,
diff --git a/src/com/wasteinformationserver/mqtt/mqtt.java b/src/com/wasteinformationserver/mqtt/mqtt.java
index 4bc8451..fe0f65a 100644
--- a/src/com/wasteinformationserver/mqtt/mqtt.java
+++ b/src/com/wasteinformationserver/mqtt/mqtt.java
@@ -1,7 +1,7 @@
package com.wasteinformationserver.mqtt;
import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.db.jdcb;
+import com.wasteinformationserver.db.JDCB;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -63,7 +63,7 @@ public class mqtt {
Log.debug(message);
- jdcb Database = new jdcb("placeuser", "eaL956R6yFItQVBl", "wasteinformation");
+ JDCB Database = new JDCB("placeuser", "eaL956R6yFItQVBl", "wasteinformation");
ResultSet result = Database.executeQuery(message);
try {
while (result.next()) {
diff --git a/src/com/wasteinformationserver/website/DataRequest.java b/src/com/wasteinformationserver/website/DataRequest.java
deleted file mode 100644
index 24cf424..0000000
--- a/src/com/wasteinformationserver/website/DataRequest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.wasteinformationserver.website;
-
-import com.wasteinformationserver.basicutils.Log;
-
-import java.util.HashMap;
-
-public class DataRequest extends PostRequest {
- @Override
- public String request(HashMap params) {
- switch (params.get("action")){
- case "senddata":
- Log.debug(params.toString());
-
- // TODO: 11.10.19 store data in database
- break;
- }
- return "";
- }
-}
diff --git a/src/com/wasteinformationserver/website/Webserver.java b/src/com/wasteinformationserver/website/Webserver.java
index 5be840d..25aa16a 100644
--- a/src/com/wasteinformationserver/website/Webserver.java
+++ b/src/com/wasteinformationserver/website/Webserver.java
@@ -2,6 +2,10 @@ package com.wasteinformationserver.website;
import com.sun.net.httpserver.HttpServer;
import com.wasteinformationserver.basicutils.Log;
+import com.wasteinformationserver.website.datarequests.CheckLoginState;
+import com.wasteinformationserver.website.datarequests.DataRequest;
+import com.wasteinformationserver.website.datarequests.LoginRequest;
+import com.wasteinformationserver.website.datarequests.RegisterRequest;
import java.io.IOException;
import java.net.InetSocketAddress;
diff --git a/src/com/wasteinformationserver/website/GetRequest.java b/src/com/wasteinformationserver/website/basicrequest/GetRequest.java
similarity index 95%
rename from src/com/wasteinformationserver/website/GetRequest.java
rename to src/com/wasteinformationserver/website/basicrequest/GetRequest.java
index 56e2ff3..d64dd21 100644
--- a/src/com/wasteinformationserver/website/GetRequest.java
+++ b/src/com/wasteinformationserver/website/basicrequest/GetRequest.java
@@ -1,4 +1,4 @@
-package com.wasteinformationserver.website;
+package com.wasteinformationserver.website.basicrequest;
import com.sun.net.httpserver.Headers;
import com.sun.net.httpserver.HttpExchange;
diff --git a/src/com/wasteinformationserver/website/PostRequest.java b/src/com/wasteinformationserver/website/basicrequest/PostRequest.java
similarity index 96%
rename from src/com/wasteinformationserver/website/PostRequest.java
rename to src/com/wasteinformationserver/website/basicrequest/PostRequest.java
index 9ad4e46..28aa7f1 100644
--- a/src/com/wasteinformationserver/website/PostRequest.java
+++ b/src/com/wasteinformationserver/website/basicrequest/PostRequest.java
@@ -1,4 +1,4 @@
-package com.wasteinformationserver.website;
+package com.wasteinformationserver.website.basicrequest;
import com.sun.net.httpserver.Headers;
import com.sun.net.httpserver.HttpExchange;
diff --git a/src/com/wasteinformationserver/website/CheckLoginState.java b/src/com/wasteinformationserver/website/datarequests/CheckLoginState.java
similarity index 86%
rename from src/com/wasteinformationserver/website/CheckLoginState.java
rename to src/com/wasteinformationserver/website/datarequests/CheckLoginState.java
index 4fe2c0b..655e458 100644
--- a/src/com/wasteinformationserver/website/CheckLoginState.java
+++ b/src/com/wasteinformationserver/website/datarequests/CheckLoginState.java
@@ -1,6 +1,7 @@
-package com.wasteinformationserver.website;
+package com.wasteinformationserver.website.datarequests;
import com.wasteinformationserver.basicutils.Log;
+import com.wasteinformationserver.website.basicrequest.PostRequest;
import java.util.HashMap;
diff --git a/src/com/wasteinformationserver/website/datarequests/DataRequest.java b/src/com/wasteinformationserver/website/datarequests/DataRequest.java
new file mode 100644
index 0000000..6a8ede3
--- /dev/null
+++ b/src/com/wasteinformationserver/website/datarequests/DataRequest.java
@@ -0,0 +1,36 @@
+package com.wasteinformationserver.website.datarequests;
+
+import com.wasteinformationserver.basicutils.Log;
+import com.wasteinformationserver.db.JDCB;
+import com.wasteinformationserver.website.basicrequest.PostRequest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+
+public class DataRequest extends PostRequest {
+ @Override
+ public String request(HashMap params) {
+ switch (params.get("action")){
+ case "senddata":
+ Log.debug(params.toString());
+
+// check if wastezone and wasteregion already exists
+
+ JDCB jdcb = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
+
+ ResultSet set = jdcb.executeQuery("select * from cities where name='"+params.get("wasteregion")+"'");
+ try {
+ System.out.println(set.getFetchSize());
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+// jdcb.executeUpdate("insert into ");
+
+ // TODO: 11.10.19 store data in database
+ break;
+ }
+ return "";
+ }
+}
diff --git a/src/com/wasteinformationserver/website/LoginRequest.java b/src/com/wasteinformationserver/website/datarequests/LoginRequest.java
similarity index 82%
rename from src/com/wasteinformationserver/website/LoginRequest.java
rename to src/com/wasteinformationserver/website/datarequests/LoginRequest.java
index ffcf476..d2d8ef5 100644
--- a/src/com/wasteinformationserver/website/LoginRequest.java
+++ b/src/com/wasteinformationserver/website/datarequests/LoginRequest.java
@@ -1,7 +1,9 @@
-package com.wasteinformationserver.website;
+package com.wasteinformationserver.website.datarequests;
import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.db.jdcb;
+import com.wasteinformationserver.db.JDCB;
+import com.wasteinformationserver.website.HttpTools;
+import com.wasteinformationserver.website.basicrequest.PostRequest;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -14,7 +16,7 @@ public class LoginRequest extends PostRequest {
String password = params.get("password");
String username = params.get("username");
- ResultSet s = new jdcb("users", "kOpaIJUjkgb9ur6S", "wasteinformation").executeQuery("select * from user where username ='" + username + "'");
+ ResultSet s = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation").executeQuery("select * from user where username ='" + username + "'");
String response = "{\"accept\": false}";
try {
diff --git a/src/com/wasteinformationserver/website/LoginState.java b/src/com/wasteinformationserver/website/datarequests/LoginState.java
similarity index 94%
rename from src/com/wasteinformationserver/website/LoginState.java
rename to src/com/wasteinformationserver/website/datarequests/LoginState.java
index bda04c7..6bf0dd2 100644
--- a/src/com/wasteinformationserver/website/LoginState.java
+++ b/src/com/wasteinformationserver/website/datarequests/LoginState.java
@@ -1,4 +1,4 @@
-package com.wasteinformationserver.website;
+package com.wasteinformationserver.website.datarequests;
public class LoginState {
private LoginState() {}
diff --git a/src/com/wasteinformationserver/website/RegisterRequest.java b/src/com/wasteinformationserver/website/datarequests/RegisterRequest.java
similarity index 72%
rename from src/com/wasteinformationserver/website/RegisterRequest.java
rename to src/com/wasteinformationserver/website/datarequests/RegisterRequest.java
index ce9f4ea..51aec93 100644
--- a/src/com/wasteinformationserver/website/RegisterRequest.java
+++ b/src/com/wasteinformationserver/website/datarequests/RegisterRequest.java
@@ -1,7 +1,9 @@
-package com.wasteinformationserver.website;
+package com.wasteinformationserver.website.datarequests;
import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.db.jdcb;
+import com.wasteinformationserver.db.JDCB;
+import com.wasteinformationserver.website.HttpTools;
+import com.wasteinformationserver.website.basicrequest.PostRequest;
import java.util.HashMap;
@@ -12,7 +14,7 @@ public class RegisterRequest extends PostRequest {
String passhash = HttpTools.StringToMD5(params.get("password"));
- jdcb myjd = new jdcb("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
+ JDCB myjd = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
int s = myjd.executeUpdate("INSERT INTO `user` (`username`, `firstName`, `secondName`, `password`, `email`, `logindate`) VALUES ('"+params.get("username")+"', '"+params.get("firstname")+"', '"+params.get("lastname")+"', '"+passhash+"', '"+params.get("email")+"', current_timestamp());");
// TODO: 27.09.19 detect if register process was successful and reply right json