diff options
Diffstat (limited to 'Dozentenmodulserver/src/sql/SQL.java')
| -rw-r--r-- | Dozentenmodulserver/src/sql/SQL.java | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 52cbefb9..a5eeb83e 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -6,6 +6,8 @@ import java.text.DateFormat; import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Random;
+import java.util.UUID;
+
import org.apache.log4j.Logger;
import server.BinaryListener;
@@ -114,7 +116,7 @@ public class SQL { return null;
}
- public int setInstitution(Connection con, String university) {
+ public String setInstitution(Connection con, String university) {
try {
Statement stm = con.createStatement();
@@ -122,8 +124,8 @@ public class SQL { .executeQuery("SELECT * FROM bwLehrpool.m_institution where name like'"
+ university + "';");
if (ret.next() == false) {
- Random rand = new Random();
- int id = rand.nextInt();
+
+ String id = UUID.randomUUID().toString();
stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_institution`(`institutionID`,`name`)VALUES('"
+ id + "','" + university + "');");
con.commit();
@@ -131,9 +133,9 @@ public class SQL { .executeQuery("SELECT institutionID FROM bwLehrpool.m_institution WHERE name like '"
+ university + "';");
rs.next();
- return rs.getInt("institutionID");
+ return rs.getString("institutionID");
} else {
- return ret.getInt("institutionID");
+ return ret.getString("institutionID");
}
} catch (SQLException e) {
@@ -141,11 +143,11 @@ public class SQL { log.info(new Date() + " - Failed to setInstitution.");
e.printStackTrace();
}
- return -1;
+ return "-1";
}
- public int setPerson(Connection con, String login, String lastname,
- String firstname, String mail, Date lastlogin, int Institution) {
+ public String setPerson(Connection con, String login, String lastname,
+ String firstname, String mail, Date lastlogin, String Institution) {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
try {
Statement stm = con.createStatement();
@@ -156,9 +158,10 @@ public class SQL { + "' and Vorname like '"
+ firstname
+ "';");
+
if (ret.next() == false) {
- Random rand = new Random();
- int id = rand.nextInt();
+
+ String id = UUID.randomUUID().toString();
stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_user`(`userID`,`loginName`,`nachname`,`vorname`,`mail`,`lastLogin`,`institution`)VALUES('"
+ id
+ "','"
@@ -182,9 +185,10 @@ public class SQL { + firstname
+ "';");
rs.next();
- return rs.getInt("userID");
+ return rs.getString("userID");
} else {
- return ret.getInt("userID");
+ ret.first();
+ return ret.getString("userID");
}
} catch (SQLException e) {
@@ -192,10 +196,10 @@ public class SQL { log.info(new Date() + " - Failed to setPerson.");
e.printStackTrace();
}
- return -1;
+ return "-1";
}
- public boolean setImageData(Connection con, int pk_person, boolean license,
+ public boolean setImageData(Connection con, String pk_person, boolean license,
boolean internet, long cpu, long ram, String imagename,
String imagePath) {
@@ -212,8 +216,8 @@ public class SQL { try {
Statement stm = con.createStatement();
- Random random = new Random();
- int uid = random.nextInt();
+
+ String uid = UUID.randomUUID().toString();
stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`)VALUES('"
+ uid // GUID_imageID
+ "',1,'" // imageVersion
@@ -316,7 +320,7 @@ public class SQL { return null;
}
- public int setLectureData(Connection con, int pk_person, int pk_image,
+ public int setLectureData(Connection con, String pk_person, String pk_image,
int imageversion, String name, String desc, String shortdesc,
String start, String end, boolean isactive) {
@@ -328,8 +332,8 @@ public class SQL { }
try {
Statement stm = con.createStatement();
- Random random = new Random();
- int uid = random.nextInt();
+
+ String uid = UUID.randomUUID().toString();
stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_lecture`(`lectureID`,`name`,`isActive`,`startTime`,`endTime`,`lastUsed`,`shortDescription`,`description`,`imageID`,`imageVersion`,`admin_createTime`,`admin_changeTime`,`admin_owner`,`admin_change_by`)VALUES('"
+ uid
+ "','"
@@ -398,7 +402,7 @@ public class SQL { return null;
}
- public int UpdateImageData(Connection con, String name, String newName,
+ public int UpdateImageData(Connection con, String name, String newName,String image_path,
boolean license, boolean internet, long cpu, long ram, String id,
String version) {
try {
@@ -420,6 +424,8 @@ public class SQL { + newVersion
+ "',`image_name` = '"
+ newName
+ + "',`image_path` = '"
+ + image_path
+ "',`image_update_time` = '"
+ formatter.format(new Date())
+ "',`rec_change_time` = '"
|