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

* code format cleanup

Browse Source 
* load total collections and future/finished ones
This commit is contained in:
lukas-heiligenbrunner
2019-12-09 14:18:27 +01:00
parent 34ab59c9a3
commit 16270da70f
20 changed files with 303 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/com/wasteinformationserver/website/datarequests/AdminRequests.java
View File

@ -1,7 +1,5 @@
package com.wasteinformationserver.website.datarequests;
import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.db.JDCB;
import com.wasteinformationserver.website.basicrequest.PostRequest;
import java.io.File;
@ -20,7 +18,7 @@ public class AdminRequests extends PostRequest {
break;
case "restartserver":
final String javaBin = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
File currentJar = null;
File currentJar = null;
try {
currentJar = new File(AdminRequests.class.getProtectionDomain().getCodeSource().getLocation().toURI());
} catch (URISyntaxException e) {
@ -28,7 +26,7 @@ public class AdminRequests extends PostRequest {
}
/* is it a jar file? */
if(!currentJar.getName().endsWith(".jar"))
if (!currentJar.getName().endsWith(".jar"))
System.out.println("not jar");
/* Build command: java -jar application.jar */

112
src/java/com/wasteinformationserver/website/datarequests/DataRequest.java
View File

@ -8,12 +8,15 @@ import java.io.IOException;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLIntegrityConstraintViolationException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
public class DataRequest extends PostRequest {
@Override
public String request(HashMap<String, String> params) {
String result = "";
StringBuilder sb = new StringBuilder();
JDCB jdcb;
try {
jdcb = JDCB.getInstance();
@ -23,7 +26,6 @@ public class DataRequest extends PostRequest {
}
switch (params.get("action")) {
case "newCity":
StringBuilder sb = new StringBuilder();
sb.append("{");
Log.debug(params.toString());
@ -67,23 +69,19 @@ public class DataRequest extends PostRequest {
sb.append(",\"query\":\"ok\"");
sb.append("}");
result = sb.toString();
break;
case "getAllCities":
StringBuilder builder = new StringBuilder();
ResultSet sett = jdcb.executeQuery("select * from cities");
Log.debug(sett.toString());
builder.append("{\"data\":[");
sb.append("{\"data\":[");
try {
while (sett.next()) {
builder.append("{\"cityname\":\"" + sett.getString("name") + "\"");
builder.append(",\"wastetype\":\"" + sett.getString("wastetype") + "\"");
builder.append(",\"id\":\"" + sett.getString("id") + "\"");
builder.append(",\"zone\":\"" + sett.getString("zone") + "\"}");
sb.append("{\"cityname\":\"" + sett.getString("name") + "\"");
sb.append(",\"wastetype\":\"" + sett.getString("wastetype") + "\"");
sb.append(",\"id\":\"" + sett.getString("id") + "\"");
sb.append(",\"zone\":\"" + sett.getString("zone") + "\"}");
if (!sett.isLast()) {
builder.append(",");
sb.append(",");
}
// System.out.println(sett.getString("name"));
@ -91,43 +89,89 @@ public class DataRequest extends PostRequest {
} catch (SQLException e) {
e.printStackTrace();
}
builder.append("]");
builder.append(",\"query\":\"ok\"");
builder.append("}");
result = builder.toString();
Log.debug(result);
sb.append("]");
sb.append(",\"query\":\"ok\"");
sb.append("}");
break;
case "deletecity":
//DELETE FROM `cities` WHERE `id`=0
StringBuilder sbb = new StringBuilder(); // TODO: 06.12.19 better naming and sb for all
sbb.append("{");
sb.append("{");
Log.debug(params.get("id"));
int status = 0;
try{
status= jdcb.executeUpdate("DELETE FROM `cities` WHERE `id`='" + params.get("id")+"'");
if (status == 1){
try {
status = jdcb.executeUpdate("DELETE FROM `cities` WHERE `id`='" + params.get("id") + "'");
if (status == 1) {
//success
sbb.append("\"status\" : \"success\"");
}else {
sbb.append("\"status\" : \"error\"");
sb.append("\"status\" : \"success\"");
} else {
sb.append("\"status\" : \"error\"");
}
}catch (SQLIntegrityConstraintViolationException e){
} catch (SQLIntegrityConstraintViolationException e) {
Log.warning("dependencies of deletion exist");
sbb.append("\"status\" : \"dependenciesnotdeleted\"");
sb.append("\"status\" : \"dependenciesnotdeleted\"");
} catch (SQLException e) {
Log.error("sql exception: "+e.getMessage());
sbb.append("\"status\" : \"error\"");
Log.error("sql exception: " + e.getMessage());
sb.append("\"status\" : \"error\"");
}
Log.debug(status);
sbb.append(",\"query\":\"ok\"");
sbb.append("}");
result = sbb.toString();
sb.append(",\"query\":\"ok\"");
sb.append("}");
break;
case "getcollectionnumber": //todo maybe combine all three to one
sb.append("{");
try {
ResultSet settt = jdcb.executeQuery("select * from pickupdates");
settt.last();
sb.append("\"collectionnumber\":\"" + settt.getRow() + "\"");
} catch (SQLException e) {
Log.error("sql exception: " + e.getMessage());
sb.append("\"status\" : \"error\"");
}
sb.append(",\"query\":\"ok\"");
sb.append("}");
break;
case "getcollectioninfuture":
sb.append("{");
try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = new Date();
String time = sdf.format(date);
ResultSet settt = jdcb.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN '"+time+"' AND '2222-12-27'");
settt.last();
sb.append("\"collectionnumber\":\"" + settt.getRow() + "\"");
} catch (SQLException e) {
Log.error("sql exception: " + e.getMessage());
sb.append("\"status\" : \"error\"");
}
sb.append(",\"query\":\"ok\"");
sb.append("}");
break;
case "getfinishedcollections":
sb.append("{");
try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = new Date();
String time = sdf.format(date);
ResultSet settt = jdcb.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN '0000-12-27' AND '"+time+"'");
settt.last();
sb.append("\"collectionnumber\":\"" + settt.getRow() + "\"");
} catch (SQLException e) {
Log.error("sql exception: " + e.getMessage());
sb.append("\"status\" : \"error\"");
}
sb.append(",\"query\":\"ok\"");
sb.append("}");
break;
}
return result;
return sb.toString();
}
}

2
src/java/com/wasteinformationserver/website/datarequests/RegisterRequest.java
View File

@ -24,7 +24,7 @@ public class RegisterRequest extends PostRequest {
}
//new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
try {
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());");
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());");
} catch (SQLException e) {
e.printStackTrace();
}

10
src/java/com/wasteinformationserver/website/datarequests/login/CheckLoginState.java
View File

@ -9,13 +9,13 @@ public class CheckLoginState extends PostRequest {
@Override
public String request(HashMap<String, String> params) {
Log.message("checking login state");
if ((params.get("action")).equals("getloginstate")){
if (LoginState.getObject().isLoggedIn()){
return "{\"loggedin\":true, \"username\":\""+LoginState.getObject().getUsername()+"\", \"permission\":\""+LoginState.getObject().getPermission()+"\"}";
}else {
if ((params.get("action")).equals("getloginstate")) {
if (LoginState.getObject().isLoggedIn()) {
return "{\"loggedin\":true, \"username\":\"" + LoginState.getObject().getUsername() + "\", \"permission\":\"" + LoginState.getObject().getPermission() + "\"}";
} else {
return "{\"loggedin\":false}";
}
}else if ((params.get("action")).equals("logout")){
} else if ((params.get("action")).equals("logout")) {
Log.debug("logging out");
LoginState.getObject().logOut();
return "{\"loggedin\":false}";

5
src/java/com/wasteinformationserver/website/datarequests/login/LoginRequest.java
View File

@ -27,7 +27,8 @@ public class LoginRequest extends PostRequest {
return "{\"status\" : \"nodbconn\"}";
}
ResultSet s = jdcb.executeQuery("select * from user where username ='" + username + "'");;
ResultSet s = jdcb.executeQuery("select * from user where username ='" + username + "'");
;
//new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation").executeQuery("select * from user where username ='" + username + "'");
Log.debug("successfully logged in to db");
String response = "{\"accept\": false}";
@ -38,7 +39,7 @@ public class LoginRequest extends PostRequest {
if (HttpTools.StringToMD5(password).equals(s.getString("password"))) {
Log.debug("login success");
LoginState.getObject().logIn();
LoginState.getObject().setAccountData(username,"","","", s.getInt("permission")); // TODO: 06.12.19
LoginState.getObject().setAccountData(username, "", "", "", s.getInt("permission")); // TODO: 06.12.19
response = "{\"accept\": true}";
} else {
Log.debug("wrong password");

27
src/java/com/wasteinformationserver/website/datarequests/login/LoginState.java
View File

@ -1,11 +1,12 @@
package com.wasteinformationserver.website.datarequests.login;
public class LoginState {
private LoginState() {}
private LoginState() {
}
private static LoginState mythis=new LoginState();
private static LoginState mythis = new LoginState();
public static LoginState getObject(){
public static LoginState getObject() {
return mythis;
}
@ -17,23 +18,23 @@ public class LoginState {
boolean loggedin = true;
public void logIn(){
loggedin=true;
public void logIn() {
loggedin = true;
}
public void logOut(){
loggedin=false;
public void logOut() {
loggedin = false;
}
public void setAccountData(String username, String firstname, String lastname, String email, int permission){
this.username=username;
this.firstname=firstname;
this.lastname=lastname;
this.email=email;
public void setAccountData(String username, String firstname, String lastname, String email, int permission) {
this.username = username;
this.firstname = firstname;
this.lastname = lastname;
this.email = email;
this.permission = permission;
}
public boolean isLoggedIn(){
public boolean isLoggedIn() {
return loggedin;
}