From cebf16350e611819f211fff438b3da07ea207859 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Sat, 12 Jan 2019 22:53:10 +0800 Subject: [PATCH 01/12] Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/wlf' into wmj # Conflicts: # GDMS.iml # src/servlet/account/login.java --- src/servlet/account/login.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/servlet/account/login.java b/src/servlet/account/login.java index 25b1c11..12a8cd0 100644 --- a/src/servlet/account/login.java +++ b/src/servlet/account/login.java @@ -31,13 +31,10 @@ public class login extends HttpServlet { } catch (Exception e) { e.printStackTrace(); } -<<<<<<< .merge_file_a01548 request.getSession().setAttribute("User",user); request.getRequestDispatcher("/home.jsp").forward(request,response); -======= request.getSession().setAttribute("User",user); request.getRequestDispatcher("/home.jsp").forward(request,response); ->>>>>>> .merge_file_a15580 } protected void doGet(HttpServletRequest request, HttpServletResponse response) From bc51aa29ff9d7ca9049070e699245ca2fd7e0d8c Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Sun, 13 Jan 2019 16:51:48 +0800 Subject: [PATCH 02/12] Merge remote-tracking branch 'remotes/origin/master' into wmj # Conflicts: # .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml --- .idea/misc.xml | 2 +- web/select.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 11bca97..35bdbab 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/web/select.jsp b/web/select.jsp index 640a15f..4b2605f 100644 --- a/web/select.jsp +++ b/web/select.jsp @@ -25,7 +25,7 @@
-
c +
李先生
From 53e7a50fa166d0bb4fc90b0aa42efb471ff52605 Mon Sep 17 00:00:00 2001 From: wlf <920607690@qq.com> Date: Mon, 14 Jan 2019 02:37:36 +0800 Subject: [PATCH 03/12] Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf # Conflicts: # GDMS.iml # src/servlet/account/login.java --- src/servlet/Submit/S_Submit.java | 16 ++++++++++++++++ src/servlet/select/S_StudentSelectTeacher.java | 4 +++- .../{ => select}/S_TeacherSelectStudent.java | 3 ++- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 src/servlet/Submit/S_Submit.java rename src/servlet/{ => select}/S_TeacherSelectStudent.java (91%) diff --git a/src/servlet/Submit/S_Submit.java b/src/servlet/Submit/S_Submit.java new file mode 100644 index 0000000..94decf4 --- /dev/null +++ b/src/servlet/Submit/S_Submit.java @@ -0,0 +1,16 @@ +package servlet.Submit; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +@WebServlet("/submit") +public class S_Submit extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + super.doPost(request, response); + String content=request.getParameter("opinion"); + + } +} diff --git a/src/servlet/select/S_StudentSelectTeacher.java b/src/servlet/select/S_StudentSelectTeacher.java index 625fbbc..777874a 100644 --- a/src/servlet/select/S_StudentSelectTeacher.java +++ b/src/servlet/select/S_StudentSelectTeacher.java @@ -4,11 +4,12 @@ import core.process.C_StudentSearchTeacher; import core.process.C_StudentSelectTeacher; import core.user.User; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; - +@WebServlet("/studentselectteacher") public class S_StudentSelectTeacher extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); @@ -17,6 +18,7 @@ public class S_StudentSelectTeacher extends HttpServlet { String teacher_id=user.getId(); try { new C_StudentSelectTeacher().select(student_id,teacher_id); + } catch (Exception e) { e.printStackTrace(); } diff --git a/src/servlet/S_TeacherSelectStudent.java b/src/servlet/select/S_TeacherSelectStudent.java similarity index 91% rename from src/servlet/S_TeacherSelectStudent.java rename to src/servlet/select/S_TeacherSelectStudent.java index bcf2b4b..4dab761 100644 --- a/src/servlet/S_TeacherSelectStudent.java +++ b/src/servlet/select/S_TeacherSelectStudent.java @@ -4,11 +4,12 @@ import core.process.C_TeacherSelectStudent; import core.user.User; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; - +@WebServlet("/teacherselectstudent") public class S_TeacherSelectStudent extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); From e0fde05f7535724f10feedfa5a16c75a11cd1f8c Mon Sep 17 00:00:00 2001 From: wlf <920607690@qq.com> Date: Mon, 14 Jan 2019 11:19:00 +0800 Subject: [PATCH 04/12] Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf # Conflicts: # GDMS.iml # src/servlet/account/login.java --- src/servlet/account/S_Register.java | 12 +++++++----- web/login.jsp | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/servlet/account/S_Register.java b/src/servlet/account/S_Register.java index b3397fb..e0bc6c1 100644 --- a/src/servlet/account/S_Register.java +++ b/src/servlet/account/S_Register.java @@ -5,6 +5,7 @@ import core.user.utils.AccountManagement; import error.GExcptAccount; import error.GExcptSQL; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -12,7 +13,7 @@ import java.io.IOException; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; - +@WebServlet("/register") public class S_Register extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -22,15 +23,16 @@ public class S_Register extends HttpServlet { user_info.put("id",id); String name=request.getParameter("name"); user_info.put("name",name); - String e_mail=request.getParameter("e-mail"); - user_info.put("e_mail",e_mail); - String phone_number=request.getParameter("phone-number"); + String e_mail_location=request.getParameter("e_mail_location"); + user_info.put("e_mail_location",e_mail_location); + String phone_number=request.getParameter("phone_number"); user_info.put("phone_number",phone_number); String password=request.getParameter("password"); user_info.put("password",password); User user=null; try { - user = AccountManagement.register("student",user_info); + String Identity=request.getParameter("Identity"); + user = AccountManagement.register(Identity,user_info); } catch (GExcptSQL gExcptSQL) { gExcptSQL.printStackTrace(); } catch (GExcptAccount gExcptAccount) { diff --git a/web/login.jsp b/web/login.jsp index 92fda2b..82983d5 100644 --- a/web/login.jsp +++ b/web/login.jsp @@ -56,7 +56,7 @@ From fcfd276d4a049d0f548aa7926bdb5d23ec1429c7 Mon Sep 17 00:00:00 2001 From: wlf <920607690@qq.com> Date: Mon, 14 Jan 2019 14:48:58 +0800 Subject: [PATCH 05/12] Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf # Conflicts: # GDMS.iml # src/servlet/account/login.java --- .idea/artifacts/GDMS_war_exploded.xml | 1 + .../356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml | 1075 +++++++++-------- .idea/encodings.xml | 4 + .idea/libraries/lib.xml | 10 + .idea/misc.xml | 2 +- 5 files changed, 582 insertions(+), 510 deletions(-) create mode 100644 .idea/encodings.xml create mode 100644 .idea/libraries/lib.xml diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml index 12d7fe5..95189d4 100644 --- a/.idea/artifacts/GDMS_war_exploded.xml +++ b/.idea/artifacts/GDMS_war_exploded.xml @@ -9,6 +9,7 @@ + diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml index 44954d9..15b9934 100644 --- a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml @@ -2,7 +2,7 @@ - 10.3.10 + 10.2.18 MariaDB InnoDB lower/lower @@ -22,2120 +22,2177 @@ utf8_general_ci - latin1_swedish_ci - - utf8_general_ci - + armscii8 0 - + armscii8 1 - + armscii8 0 - + armscii8 0 - + ascii 0 - + ascii 1 - + ascii 0 - + ascii 0 - + big5 0 - + big5 1 - + big5 0 - + big5 0 - + binary 1 - + cp1250 0 - + cp1250 0 - + cp1250 0 - + cp1250 1 - + cp1250 0 - + cp1250 0 - + cp1250 0 - + cp1251 0 - + cp1251 0 - + cp1251 1 - + cp1251 0 - + cp1251 0 - + cp1251 0 - + cp1251 0 - + cp1256 0 - + cp1256 1 - + cp1256 0 - + cp1256 0 - + cp1257 0 - + cp1257 1 - + cp1257 0 - + cp1257 0 - + cp1257 0 - + cp850 0 - + cp850 1 - + cp850 0 - + cp850 0 - + cp852 0 - + cp852 1 - + cp852 0 - + cp852 0 - + cp866 0 - + cp866 1 - + cp866 0 - + cp866 0 - + cp932 0 - + cp932 1 - + cp932 0 - + cp932 0 - + dec8 0 - + dec8 0 - + dec8 1 - + dec8 0 - + eucjpms 0 - + eucjpms 1 - + eucjpms 0 - + eucjpms 0 - + euckr 0 - + euckr 1 - + euckr 0 - + euckr 0 - + gb2312 0 - + gb2312 1 - + gb2312 0 - + gb2312 0 - + gbk 0 - + gbk 1 - + gbk 0 - + gbk 0 - + geostd8 0 - + geostd8 1 - + geostd8 0 - + geostd8 0 - + greek 0 - + greek 1 - + greek 0 - + greek 0 - + hebrew 0 - + hebrew 1 - + hebrew 0 - + hebrew 0 - + hp8 0 - + hp8 1 - + hp8 0 - + hp8 0 - + keybcs2 0 - + keybcs2 1 - + keybcs2 0 - + keybcs2 0 - + koi8r 0 - + koi8r 1 - + koi8r 0 - + koi8r 0 - + koi8u 0 - + koi8u 1 - + koi8u 0 - + koi8u 0 - + latin1 0 - + latin1 0 - + latin1 0 - + latin1 0 - + latin1 0 - + latin1 0 - + latin1 0 - + latin1 0 - + latin1 1 - + latin1 0 - + latin2 0 - + latin2 0 - + latin2 0 - + latin2 1 - + latin2 0 - + latin2 0 - + latin2 0 - + latin5 0 - + latin5 0 - + latin5 1 - + latin5 0 - + latin7 0 - + latin7 0 - + latin7 1 - + latin7 0 - + latin7 0 - + latin7 0 - + macce 0 - + macce 1 - + macce 0 - + macce 0 - + macroman 0 - + macroman 1 - + macroman 0 - + macroman 0 - + sjis 0 - + sjis 1 - + sjis 0 - + sjis 0 - + swe7 0 - + swe7 0 - + swe7 1 - + swe7 0 - + tis620 0 - + tis620 0 - + tis620 1 - + tis620 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 1 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ucs2 0 - + ujis 0 - + ujis 1 - + ujis 0 - + ujis 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 1 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16 0 - + utf16le 0 - + utf16le 1 - + utf16le 0 - + utf16le 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 1 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf32 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 1 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 1 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - + utf8mb4 0 - +
管理员
- +
公告
- +
毕业设计
- +
毕设论文
- +
指导老师评定成绩
- +
评阅老师对论文的评审成绩
- +
毕业设计信息
- +
开题报告
- +
开题报告会纪要
- +
答辩
- +
答辩记录表
- +
开题报告秘书组
- +
开题报告老师组
- +
专业信息
- +
答辩秘书小组
- +
答辩教师组
- +
学生用户
- +
老师用户
- + 1 char(20)|0s 1 normal - + 2 char(255)|0s 1 normal - + 3 char(30)|0s normal - + 4 char(40)|0s normal - + 5 char(20)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 text|0s normal - + 3 text|0s normal - + 4 date|0s normal - + 5 varchar(255)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 4 char(1)|0s normal - + 5 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 int(11)|0s normal - + 3 date|0s normal - + 4 varchar(255)|0s normal - + 5 text|0s normal - + 6 text|0s normal - + 7 text|0s normal - + 8 text|0s normal - + 9 float|0s normal - + 10 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 float|0s normal - + 3 float|0s normal - + 4 float|0s normal - + 5 float|0s normal - + 6 float|0s normal - + 7 float|0s normal - + 8 float|0s normal - + 9 float|0s normal - + 10 float|0s normal - + 11 float|0s normal - + 12 float|0s normal - + 13 float|0s normal - + 14 float|0s normal - + 15 float|0s normal - + 16 float|0s normal - + 17 text|0s normal - + 18 date|0s normal - + 19 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 float|0s normal - + 3 text|0s normal - + 4 date|0s normal - + 5 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 varchar(255)|0s normal - + 3 varchar(255)|0s normal - + 4 varchar(255)|0s normal - + 5 varchar(255)|0s normal - + 6 varchar(255)|0s normal - + 7 text|0s normal - + 8 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 date|0s normal - + 3 varchar(255)|0s normal - + 4 varchar(255)|0s normal - + 5 char(20)|0s normal - + 6 char(20)|0s normal - + 7 int(11)|0s normal - + 8 char(1)|0s normal - - 9 - char(1)|0s - normal - - - 10 - char(1)|0s - normal - - - 11 - char(1)|0s - normal - - - 12 - char(1)|0s - normal - - +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 1 id 1 - +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 1 char(20)|0s 1 normal - +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 2 text|0s normal - +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 3 date|0s normal - +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 4 text|0s normal - +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 5 date|0s normal - +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 6 text|0s normal - +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 7 date|0s normal - +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 8 text|0s normal - +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 9 date|0s normal +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 + 10 + char(1)|0s + normal + +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 + 11 + char(1)|0s + normal + +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 + 12 + char(1)|0s + normal + +<<<<<<<<< Temporary merge branch 1 + +========= + +>>>>>>>>> Temporary merge branch 2 + 13 + char(1)|0s + normal + +<<<<<<<<< Temporary merge branch 1 +========= + +>>>>>>>>> Temporary merge branch 2 1 id 1 - + 1 char(20)|0s 1 normal - + 2 date|0s normal - + 3 varchar(255)|0s normal - + 4 char(20)|0s normal - + 5 char(20)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 text|0s normal - + 3 date|0s normal - + 4 text|0s normal - + 5 date|0s normal - + 6 text|0s normal - + 7 float|0s normal - + 8 date|0s normal - + 9 text|0s normal - + 10 float|0s normal - + 11 date|0s normal - + 12 text|0s normal - + 13 float|0s normal - + 14 date|0s normal - + 15 char(1)|0s normal - + 16 char(1)|0s normal - + 17 char(1)|0s normal - + 18 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 1 leader_student_id 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 1 leader_teacher_id 1 - + 1 char(8)|0s 1 normal - + 2 varchar(255)|0s normal - + 3 varchar(255)|0s normal - + 4 varchar(255)|0s normal - + 1 profession_code 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 1 leader_student_id 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 1 leader_teacher_id 1 - + 1 char(20)|0s 1 normal - + 2 char(255)|0s 1 normal - + 3 char(30)|0s normal - + 4 char(40)|0s normal - + 5 char(20)|0s normal - + 6 char(4)|0s normal - + 7 char(8)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 char(255)|0s 1 normal - + 3 char(30)|0s normal - + 4 char(40)|0s normal - + 5 char(20)|0s normal - + 6 varchar(255)|0s normal - + 7 varchar(255)|0s normal - + 8 char(8)|0s normal - + 1 id 1 diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml new file mode 100644 index 0000000..2310603 --- /dev/null +++ b/.idea/libraries/lib.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 11bca97..df60b67 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file From 159041f5eee2110f62015f28b1c498d0f9814e13 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Mon, 14 Jan 2019 16:25:34 +0800 Subject: [PATCH 06/12] Merge remote-tracking branch 'remotes/origin/hechu1' into wmj # Conflicts: # GDMS.iml --- .idea/artifacts/GDMS_war_exploded.xml | 1 + GDMS.iml | 13 ++--- src/core/process/C_StudentSearchTeacher.java | 27 +++++++++-- src/core/process/C_StudentSelectTeacher.java | 36 +++++++++++--- src/core/process/C_TeacherSearchStudent.java | 29 ++++++++++-- src/core/process/C_TeacherSelectStudent.java | 47 ++++++++++++------- .../C_TeacherUploadOpeningReportOpinion.java | 4 ++ src/core/process/Process.java | 1 + src/error/GExcptInit.java | 5 +- 9 files changed, 124 insertions(+), 39 deletions(-) create mode 100644 src/core/process/C_TeacherUploadOpeningReportOpinion.java diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml index 12d7fe5..95189d4 100644 --- a/.idea/artifacts/GDMS_war_exploded.xml +++ b/.idea/artifacts/GDMS_war_exploded.xml @@ -9,6 +9,7 @@ + diff --git a/GDMS.iml b/GDMS.iml index f7dd5c2..729345a 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -9,6 +9,7 @@ + @@ -19,20 +20,21 @@ - - + - + + + - + @@ -41,12 +43,11 @@ - + - \ No newline at end of file diff --git a/src/core/process/C_StudentSearchTeacher.java b/src/core/process/C_StudentSearchTeacher.java index 2bb3080..65931e4 100644 --- a/src/core/process/C_StudentSearchTeacher.java +++ b/src/core/process/C_StudentSearchTeacher.java @@ -1,24 +1,29 @@ package core.process; import core.operation.Search; +import error.GExcptInit; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -public class C_StudentSearchTeacher { +public class C_StudentSearchTeacher extends TempProcess{ + String teacherID; + + static String table = "teacher"; + Map TeacherInfo=new HashMap(); - public Map search(String teacherID) throws Exception { + public Map search() throws Exception { + if(!check()) throw new GExcptInit("teacherID Attrs init error!"); Search search = new Search() ; search.setOptions(new HashMap<>()); - String table = "teacher"; search.addOptions("table",table); List fields = new ArrayList<>(); fields.add("*"); search.addOptions("field",fields); Map limits = new HashMap<>(); - limits.put("id",teacherID); + limits.put("id",this.getTeacherID()); search.addOptions("limits",limits); search.addOptions("start",0); search.addOptions("end",1); @@ -27,6 +32,20 @@ public class C_StudentSearchTeacher { String[] s = result.get(0); TeacherInfo.put("id",s[0]); TeacherInfo.put("name",s[2]); + TeacherInfo.put("e_mail_location",s[3]); + TeacherInfo.put("phone_number",s[4]); return TeacherInfo; } + + protected boolean check() { + if(this.getTeacherID()==null) + return false; + return true; + } + public String getTeacherID(){ + return teacherID; + } + public void setTeacherID(String teacherID){ + this.teacherID=teacherID; + } } diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index e60acc8..ee8ada0 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -1,22 +1,46 @@ package core.process; import core.operation.Select; +import error.GExcptInit; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -public class C_StudentSelectTeacher extends Process { - public void select(String studentID,String teacherID)throws Exception{ +public class C_StudentSelectTeacher extends TempProcess { + String studentId; + String teacherId; + + public void select()throws Exception{ + if(!check()) throw new GExcptInit("ID Attrs init error!"); Select select=new Select(); select.setOptions(new HashMap<>()); - String student_id=studentID; - select.addOptions("student_id",student_id); - String teacher_id=teacherID; - select.addOptions("teacher_id",teacher_id); + select.addOptions("student_id",this.getStudentId()); + select.addOptions("teacher_id",this.getTeacherId()); Map options=select.execute(null); } + protected boolean check() { + if(this.getStudentId()==null||this.getTeacherId()==null) + return false; + return true; + } + public String getTeacherId() { + return teacherId; + } + + public void setTeacherId(String teacherId) { + this.teacherId = teacherId; + } + + public String getStudentId() { + return studentId; + } + + public void setStudentId(String studentId) { + this.studentId = studentId; + } + } diff --git a/src/core/process/C_TeacherSearchStudent.java b/src/core/process/C_TeacherSearchStudent.java index 8fe27b0..4c1be5d 100644 --- a/src/core/process/C_TeacherSearchStudent.java +++ b/src/core/process/C_TeacherSearchStudent.java @@ -1,24 +1,29 @@ package core.process; import core.operation.Search; +import error.GExcptInit; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -public class C_TeacherSearchStudent { - Map StudentInfo=new HashMap(); - public Map search(String studentID) throws Exception{ +public class C_TeacherSearchStudent extends TempProcess { + String studentId; + + static String table="student"; + + Map StudentInfo=new HashMap(); + public Map search() throws Exception{ + if(!check()) throw new GExcptInit("studentId Attrs init error!"); Search search = new Search() ; search.setOptions(new HashMap<>()); - String table = "student"; search.addOptions("table",table); List fields = new ArrayList<>(); fields.add("*"); search.addOptions("field",fields); Map limits = new HashMap<>(); - limits.put("id",studentID); + limits.put("id",this.getStudentId()); search.addOptions("limits",limits); search.addOptions("start",0); search.addOptions("end",1); @@ -27,6 +32,20 @@ public class C_TeacherSearchStudent { String[] s = result.get(0); StudentInfo.put("id",s[0]); StudentInfo.put("name",s[2]); + StudentInfo.put("e_mail_location",s[3]); + StudentInfo.put("phone_number",s[4]); return StudentInfo; } + protected boolean check() { + if(this.getStudentId()==null) + return false; + return true; + } + public String getStudentId(){ + return studentId; + } + public void setStudentId(String studentId){ + this.studentId=studentId; + } + } diff --git a/src/core/process/C_TeacherSelectStudent.java b/src/core/process/C_TeacherSelectStudent.java index a13ef73..643b493 100644 --- a/src/core/process/C_TeacherSelectStudent.java +++ b/src/core/process/C_TeacherSelectStudent.java @@ -1,33 +1,46 @@ package core.process; import core.operation.Select; +import error.GExcptInit; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -public class C_TeacherSelectStudent extends Process { - List list; - - public C_TeacherSelectStudent clone(){ - C_TeacherSelectStudent tst = new C_TeacherSelectStudent(); - tst.setInfo( this.getInfo()); - List list = new ArrayList<>(); - for(String s:this.list){ - list.add(new String(s)); - } - return null; - } - public void select(String teacherID,String studentID)throws Exception{ +public class C_TeacherSelectStudent extends TempProcess { + String studentId; + String teacherId; + + public void select()throws Exception{ + if(!check()) throw new GExcptInit("ID Attrs init error!"); Select select=new Select(); select.setOptions(new HashMap<>()); - String teacher_id=teacherID; - select.addOptions("teacher_id",teacher_id); - String student_id=studentID; - select.addOptions("student_id",student_id); + select.addOptions("teacher_id",this.getTeacherId()); + select.addOptions("student_id",this.getStudentId()); Map options=select.execute(null); } + protected boolean check() { + if(this.getStudentId()==null||this.getTeacherId()==null) + return false; + return true; + } + public String getTeacherId() { + return teacherId; + } + + public void setTeacherId(String teacherId) { + this.teacherId = teacherId; + } + + public String getStudentId() { + return studentId; + } + + public void setStudentId(String studentId) { + this.studentId = studentId; + } + } diff --git a/src/core/process/C_TeacherUploadOpeningReportOpinion.java b/src/core/process/C_TeacherUploadOpeningReportOpinion.java new file mode 100644 index 0000000..cfee3ad --- /dev/null +++ b/src/core/process/C_TeacherUploadOpeningReportOpinion.java @@ -0,0 +1,4 @@ +package core.process; + +public class C_TeacherUploadOpeningReportOpinion { +} diff --git a/src/core/process/Process.java b/src/core/process/Process.java index a79f94f..40d1081 100644 --- a/src/core/process/Process.java +++ b/src/core/process/Process.java @@ -11,6 +11,7 @@ public abstract class Process{ private String buttonName; private String info; + protected abstract boolean check(); public String getPermission() { return permission; } diff --git a/src/error/GExcptInit.java b/src/error/GExcptInit.java index f6e87cc..ad1ec99 100644 --- a/src/error/GExcptInit.java +++ b/src/error/GExcptInit.java @@ -1,4 +1,7 @@ package error; -public class GExcptInit { +public class GExcptInit extends GExcpt { + public GExcptInit(String info) { + super(info); + } } From 96b6fc23b415fe78ffa915612bd0ac302c66ef34 Mon Sep 17 00:00:00 2001 From: wlf <920607690@qq.com> Date: Mon, 14 Jan 2019 16:57:29 +0800 Subject: [PATCH 07/12] Merge remote-tracking branch 'remotes/origin/master' into wlf # Conflicts: # src/servlet/account/Register.java --- src/servlet/Submit/S_TextSubmit.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/servlet/Submit/S_TextSubmit.java b/src/servlet/Submit/S_TextSubmit.java index 5a54b89..f799e8a 100644 --- a/src/servlet/Submit/S_TextSubmit.java +++ b/src/servlet/Submit/S_TextSubmit.java @@ -7,8 +7,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/submit") -public class S_Submit extends HttpServlet { +@WebServlet("/textsubmit") +public class S_TextSubmit extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); String content=new String(request.getParameter("text").getBytes("ISO8859-1"),"UTF-8"); From 06841d30db097e70e9b5b90cea20415b648e6f8b Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Mon, 14 Jan 2019 16:58:02 +0800 Subject: [PATCH 08/12] Merge remote-tracking branch 'remotes/origin/hechu1' into wmj # Conflicts: # GDMS.iml --- src/core/process/C_TeacherUploadOpeningReportOpinion.java | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/core/process/C_TeacherUploadOpeningReportOpinion.java diff --git a/src/core/process/C_TeacherUploadOpeningReportOpinion.java b/src/core/process/C_TeacherUploadOpeningReportOpinion.java deleted file mode 100644 index cfee3ad..0000000 --- a/src/core/process/C_TeacherUploadOpeningReportOpinion.java +++ /dev/null @@ -1,4 +0,0 @@ -package core.process; - -public class C_TeacherUploadOpeningReportOpinion { -} From c6e2ca10fb1fad52916227521263a9828d8f03a0 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Mon, 14 Jan 2019 17:03:26 +0800 Subject: [PATCH 09/12] Merge remote-tracking branch 'remotes/origin/hechu1' into wmj # Conflicts: # GDMS.iml --- .../process/C_StudentUploadOpeningReport.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 src/core/process/C_StudentUploadOpeningReport.java diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java new file mode 100644 index 0000000..88ed26e --- /dev/null +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -0,0 +1,49 @@ +package core.process; + +import core.operation.UploadFileOperation; +import error.GExcptInit; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +public class C_StudentUploadOpeningReport extends TempProcess{ + File openingReport; + String gaduationDesignId; + + static String file_type = "opening_report"; + + public void uploadOpeningReport() throws Exception{ + if(!check()) throw new GExcptInit("Upload OpeningReport Attrs init error!"); + UploadFileOperation uploadFileOperation=new UploadFileOperation(); + uploadFileOperation.setOptions(new HashMap<>()); + uploadFileOperation.addOptions("file",this.getOpeningReport()); + uploadFileOperation.addOptions("file_type",file_type); + Maplimits = new HashMap<>(); + limits.put("id",this.getGaduationDesignId()); + uploadFileOperation.addOptions("limits",limits); + uploadFileOperation.execute(null); + } + + protected boolean check() { + if(this.getGaduationDesignId()==null||this.getOpeningReport()==null) + return false; + return true; + } + + public File getOpeningReport() { + return openingReport; + } + + public void setOpeningReport(File openingReport) { + this.openingReport = openingReport; + } + + public String getGaduationDesignId() { + return gaduationDesignId; + } + + public void setGaduationDesignId(String gaduationDesignId) { + this.gaduationDesignId = gaduationDesignId; + } +} From 7ef690872056bff67cd3a329e3de0592dea5c8e9 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Mon, 14 Jan 2019 17:23:10 +0800 Subject: [PATCH 10/12] Merge remote-tracking branch 'remotes/origin/hechu1' into wmj # Conflicts: # GDMS.iml --- .../C_TeachearFillTopicInformation.java | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 src/core/process/C_TeachearFillTopicInformation.java diff --git a/src/core/process/C_TeachearFillTopicInformation.java b/src/core/process/C_TeachearFillTopicInformation.java new file mode 100644 index 0000000..4f6b736 --- /dev/null +++ b/src/core/process/C_TeachearFillTopicInformation.java @@ -0,0 +1,64 @@ +package core.process; + +import core.operation.FillInformation; +import error.GExcptInit; + +import org.w3c.dom.Text; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_TeacherFillTopicInformation extends TempProcess{ + + String StudentId; + String mentor_opinion; + Date mentor_opinion_date; + + static String table="graduation_design_opening_report_opinion_record"; + + public void fillInformation() throws Exception{ + if(!check()) throw new GExcptInit("FillInformation Attrs init error!"); + FillInformation fillInformation=new FillInformation(); + fillInformation.setOptions(new HashMap<>()); + fillInformation.addOptions("table",table); + String date= mentor_opinion_date.toString(); + Map vMap=new HashMap<>(); + vMap.put("mentor_opinion_date",date); + vMap.put("mentor_opinion",this.getMentor_opinion()); + Maplimits = new HashMap<>(); + limits.put("id",this.getStudentId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + + } + protected boolean check() { + if(this.getMentor_opinion()==null||this.getMentor_opinion_date()==null||this.getStudentId()==null) + return false; + return true; + } + public String getStudentId() { + return StudentId; + } + + public void setStudentId(String studentId) { + StudentId = studentId; + } + public String getMentor_opinion() { + return mentor_opinion; + } + + public void setMentor_opinion(String mentor_opinion) { + this.mentor_opinion = mentor_opinion; + } + + public Date getMentor_opinion_date() { + return mentor_opinion_date; + } + + public void setMentor_opinion_date(Date mentor_opinion_date) { + this.mentor_opinion_date = mentor_opinion_date; + } + +} From 96258f81e08ea741e1cf8d4225128b5db6547820 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Mon, 14 Jan 2019 17:24:32 +0800 Subject: [PATCH 11/12] Merge remote-tracking branch 'remotes/origin/hechu1' into wmj # Conflicts: # GDMS.iml --- ...opicInformation.java => C_TeacherFillTopicInformation.java} | 3 --- 1 file changed, 3 deletions(-) rename src/core/process/{C_TeachearFillTopicInformation.java => C_TeacherFillTopicInformation.java} (96%) diff --git a/src/core/process/C_TeachearFillTopicInformation.java b/src/core/process/C_TeacherFillTopicInformation.java similarity index 96% rename from src/core/process/C_TeachearFillTopicInformation.java rename to src/core/process/C_TeacherFillTopicInformation.java index 4f6b736..6d72cd4 100644 --- a/src/core/process/C_TeachearFillTopicInformation.java +++ b/src/core/process/C_TeacherFillTopicInformation.java @@ -3,9 +3,6 @@ package core.process; import core.operation.FillInformation; import error.GExcptInit; -import org.w3c.dom.Text; - -import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.Map; From 4c8b5c52f8c74101643db2ecd504af7b5c3d6627 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Mon, 14 Jan 2019 17:27:01 +0800 Subject: [PATCH 12/12] =?UTF-8?q?1=E3=80=81=E5=AE=8C=E6=88=90=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E5=92=8C=E8=80=81=E5=B8=88status=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dao/DBManagement.java | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/dao/DBManagement.java b/src/dao/DBManagement.java index f338435..37c0aaf 100644 --- a/src/dao/DBManagement.java +++ b/src/dao/DBManagement.java @@ -60,19 +60,32 @@ public class DBManagement { public static Map graduationDesignStudentTables = new HashMap<>(){ { put("graduation_design.student_id","graduation_design.student_chooser_teacher_status"); - - - put("opening_report_secretary_team.leader_student_id",""); - put("opening_report_secretary_team.student1_id",""); - put("opening_report_secretary_team.student2_id",""); - put("reply_secretary_team.leader_student_id",""); - put("reply_secretary_team.student1_id",""); - put("reply_secretary_team.student2_id",""); + put("graduation_design.student_id","graduation_design_information.student_fill_graduation_design_information_status"); + put("graduation_design.student_id","graduation_design_opening_report.opening_report_status"); + put("opening_report_secretary_team.leader_student_id","graduation_design_opening_report_opinion_record.opening_report_secretary_record_status"); + put("opening_report_secretary_team.student1_id","graduation_design_opening_report_opinion_record.opening_report_secretary_record_status"); + put("opening_report_secretary_team.student2_id","graduation_design_opening_report_opinion_record.opening_report_secretary_record_status"); + put("graduation_design.student_id","graduation_design_finished_product.finished_product_status"); + put("reply_secretary_team.leader_student_id","graduation_design_reply_opinion_record_score.reply_ secretary_record_status"); + put("reply_secretary_team.teacher1_id","graduation_design_reply_opinion_record_score.reply_ secretary_record_status"); + put("reply_secretary_team.teacher2_id","graduation_design_reply_opinion_record_score.reply_ secretary_record_status"); } }; public static Map graduationDesignTeacherTables = new HashMap<>(){ { - put("",""); + put("graduation_design.teacher_id","graduation_design.teacher_choose_student_status"); + put("graduation_design.teacher_id","graduation_design_opening_report_opinion_record.opening_report_mentor_opinion_status"); + put("opening_report_teacher_team.leader_teacher_id","graduation_design_opening_report_opinion_record.opening_report_teacher_team_opinion_status"); + put("opening_report_teacher_team.teacher1_id","graduation_design_opening_report_opinion_record.opening_report_teacher_team_opinion_status"); + put("opening_report_teacher_team.teacher2_id","graduation_design_opening_report_opinion_record.opening_report_teacher_team_opinion_status"); + put("graduation_design_opening_report_opinion_record.opening_report_college_teacher_id","graduation_design_opening_report_opinion_record.opening_report_college_opinion_status"); + put("graduation_design.teacher_id","graduation_design_finished_product_mentor_score.finished_product_mentor_score_status"); + put("graduation_design_finished_product_reviewer_score.reviewer_teacher_id","graduation_design_finished_product_reviewer_score.finished_product_reviewer_score_status"); + put("reply_teacher_team.leader_teacher_id","graduation_design_reply_opinion_record_score.reply_ teacher_team_score_status"); + put("reply_teacher_team. teacher1_id","graduation_design_reply_opinion_record_score.reply_ teacher_team_score_status"); + put("reply_teacher_team. teacher2_id","graduation_design_reply_opinion_record_score.reply_ teacher_team_score_status"); + put("graduation_design_reply_opinion_record_score.reply_college_teacher_id","graduation_design_reply_opinion_record_score.reply_college_score_status"); + put("graduation_design_reply_opinion_record_score.reply_school_teacher_id","graduation_design_reply_opinion_record_score.reply_school_score_status"); } }; public static String driverClassName="org.mariadb.jdbc.Driver";