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/34] 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/34] 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/34] 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/34] 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/34] 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 22c50028202a101866d45e358632dd65b04a183a Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Mon, 14 Jan 2019 15:40:54 +0800 Subject: [PATCH 06/34] =?UTF-8?q?1=E3=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml index f80b89c..73663ac 100644 --- a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml @@ -1,9 +1,9 @@ - + 10.3.10 - MariaDB + MARIADB InnoDB lower/lower 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 07/34] 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 08/34] 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 09/34] 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 10/34] 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 11/34] 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 12/34] 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 13/34] =?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"; From 0dff0df466666f564b70cbba0df3a9d15482b6d2 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Mon, 14 Jan 2019 17:58:19 +0800 Subject: [PATCH 14/34] =?UTF-8?q?=E5=AE=8C=E5=96=84gdms=EF=BC=8C=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=94=A8=E6=88=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment/context.xml | 2 +- documents/GDMS_DB_Design .txt | 2 +- documents/数据库.txt | 2 +- ...loadFileOperation.java => UploadFile.java} | 2 +- ...loadFileOperation.json => UploadFile.json} | 0 src/core/process/Process.java | 22 +++++++----- src/core/process/ProcessManagement.java | 30 +++++++++++----- src/error/GExcptInit.java | 7 ++++ src/gdms/GDMS.java | 34 +++++++++++++++++++ src/gdms/GlobalTimePoint.json | 3 ++ src/gdms/main.java | 18 ---------- web/WEB-INF/tld/c-1_0-rt.tld | 6 ++-- web/WEB-INF/tld/c-1_0.tld | 14 ++++---- web/WEB-INF/tld/c.tld | 8 ++--- web/WEB-INF/tld/sql-1_0-rt.tld | 2 +- web/WEB-INF/tld/sql-1_0.tld | 4 +-- web/WEB-INF/tld/sql.tld | 2 +- 17 files changed, 102 insertions(+), 56 deletions(-) rename src/core/operation/{UploadFileOperation.java => UploadFile.java} (95%) rename src/core/operation/{UploadFileOperation.json => UploadFile.json} (100%) create mode 100644 src/error/GExcptInit.java create mode 100644 src/gdms/GDMS.java create mode 100644 src/gdms/GlobalTimePoint.json delete mode 100644 src/gdms/main.java diff --git a/deployment/context.xml b/deployment/context.xml index 9e9d9af..70d970a 100644 --- a/deployment/context.xml +++ b/deployment/context.xml @@ -4,7 +4,7 @@ name="jdbc/gdms" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" driverClassName="com.mysql.jdbc.Driver" - url="jdbc:mariadb://localhost:3306/gdms" + targetURL="jdbc:mariadb://localhost:3306/gdms" username="gdms" password="GDMS"/> diff --git a/documents/GDMS_DB_Design .txt b/documents/GDMS_DB_Design .txt index 5cc8f24..af8b8f1 100644 --- a/documents/GDMS_DB_Design .txt +++ b/documents/GDMS_DB_Design .txt @@ -3,7 +3,7 @@ password char 256 name varchar 50 e_mail_location varchar 50 phonenumber varchar 30 -url varchar 256 +targetURL varchar 256 administrator id diff --git a/documents/数据库.txt b/documents/数据库.txt index 635fa76..37f6ce0 100644 --- a/documents/数据库.txt +++ b/documents/数据库.txt @@ -3,7 +3,7 @@ password char 255//用户密码 name char 30//用户姓名 e_mail_location char 40//邮箱 phone_number char 20//电话号码 -url varchar 255//......路径 +targetURL varchar 255//......路径 administrator//管理员 id//管理员ID diff --git a/src/core/operation/UploadFileOperation.java b/src/core/operation/UploadFile.java similarity index 95% rename from src/core/operation/UploadFileOperation.java rename to src/core/operation/UploadFile.java index ff26329..b75dcfa 100644 --- a/src/core/operation/UploadFileOperation.java +++ b/src/core/operation/UploadFile.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class UploadFileOperation extends Operation { +public class UploadFile extends Operation { @Override public Map execute(User subject) throws Exception { File file = (File) this.getOptions().get("file"); diff --git a/src/core/operation/UploadFileOperation.json b/src/core/operation/UploadFile.json similarity index 100% rename from src/core/operation/UploadFileOperation.json rename to src/core/operation/UploadFile.json diff --git a/src/core/process/Process.java b/src/core/process/Process.java index a79f94f..5ef1c49 100644 --- a/src/core/process/Process.java +++ b/src/core/process/Process.java @@ -4,12 +4,14 @@ import core.operation.Operation; public abstract class Process{ - private char status; + private String status; private String permission; private Operation operation; - private String buttonName; private String info; + private static String buttonName; + protected static String targetURL; + protected static String iconURL; public String getPermission() { return permission; @@ -31,10 +33,6 @@ public abstract class Process{ return buttonName; } - public void setButtonName(String buttonName) { - this.buttonName = buttonName; - } - public String getInfo() { return info; } @@ -43,11 +41,19 @@ public abstract class Process{ this.info = info; } - public char getStatus() { + public String getStatus() { return status; } - public void setStatus(char status) { + public void setStatus(String status) { this.status = status; } + + public static String getTargetURL() { + return targetURL; + } + + public static String getIconURL() { + return iconURL; + } } diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index 7e9f354..ee0fae9 100644 --- a/src/core/process/ProcessManagement.java +++ b/src/core/process/ProcessManagement.java @@ -2,17 +2,19 @@ package core.process; import core.user.User; import dao.DBManagement; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; public class ProcessManagement { - public static Condition getCondition(User user) { - Map status = getStatus(user); + public static Condition getCondition(User user) throws Exception { + Map status = getStatus(user); return getCondition(user,status); } - public static Condition getCondition(User user, Map status){ + public static Condition getCondition(User user, Map status){ Condition condition = new Condition(); - for(Map.Entry entry:status.entrySet()){ + for(Map.Entry entry:status.entrySet()){ String[] s = entry.getKey().split("."); TempProcess tempProcess = (TempProcess) getProcess(s[1]); tempProcess.setGraduationDesignId(s[0]); @@ -28,17 +30,29 @@ public class ProcessManagement { } //Map - public static Map getStatus(User user){ - + public static Map getStatus(User user) throws Exception { + Map status = new HashMap<>(); Map userTables = DBManagement.getUserStatusTables(user.getType()); String graduationDesignId = null; for(Map.Entry entry:userTables.entrySet()){ String[] ti = entry.getKey().split("."); String[] ts = entry.getValue().split("."); + List ls = new ArrayList<>(); + ls.add("id"); + Map limits = new HashMap<>(); + limits.put(ti[1],user.getId()); + List resultLs = DBManagement.select(ls,ti[0],limits,0,1); + if(resultLs.size()==0) continue; + graduationDesignId = resultLs.get(0)[0]; + ls = new ArrayList<>(); + ls.add(ts[1]); + limits = new HashMap<>(); + limits.put("id",graduationDesignId); + resultLs = DBManagement.select(ls,ts[0],limits,0,1); + status.put(graduationDesignId+"."+ts[1],resultLs.get(0)[0]); } - - return null; + return status; } public static Process getProcess(String process){ return null; diff --git a/src/error/GExcptInit.java b/src/error/GExcptInit.java new file mode 100644 index 0000000..ad1ec99 --- /dev/null +++ b/src/error/GExcptInit.java @@ -0,0 +1,7 @@ +package error; + +public class GExcptInit extends GExcpt { + public GExcptInit(String info) { + super(info); + } +} diff --git a/src/gdms/GDMS.java b/src/gdms/GDMS.java new file mode 100644 index 0000000..3a10322 --- /dev/null +++ b/src/gdms/GDMS.java @@ -0,0 +1,34 @@ +package gdms; + +import error.GExcptInit; + +import java.util.*; + +public class GDMS { + static Map schedules; + static String schedulePath = ""; + public static void init() throws GExcptInit { + initSchedule(); + Timer timer = new Timer(true); + for(Map.Entry schedule:schedules.entrySet()){ + timer.schedule(getTimerTask(schedule.getKey()),schedule.getValue()); + } + } + + private static TimerTask getTimerTask(String s) throws GExcptInit { + if(s==""){ + return new TimerTask() { + @Override + public void run() { + ; + } + }; + } + + throw new GExcptInit("GlobalTimePoint.json error"); + } + + private static void initSchedule() { + + } +} diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json new file mode 100644 index 0000000..66e7376 --- /dev/null +++ b/src/gdms/GlobalTimePoint.json @@ -0,0 +1,3 @@ +{ + "":"" +} \ No newline at end of file diff --git a/src/gdms/main.java b/src/gdms/main.java deleted file mode 100644 index a6931aa..0000000 --- a/src/gdms/main.java +++ /dev/null @@ -1,18 +0,0 @@ -package gdms; - -public class main { - public static void check()throws Exception{ - checkJson(); - } - - private static void checkJson() throws Exception{ - //todo - } - - public static void init(){ - } - public static void run() throws Exception { - check(); - init(); - } -} diff --git a/web/WEB-INF/tld/c-1_0-rt.tld b/web/WEB-INF/tld/c-1_0-rt.tld index 2203657..3700a9e 100644 --- a/web/WEB-INF/tld/c-1_0-rt.tld +++ b/web/WEB-INF/tld/c-1_0-rt.tld @@ -82,7 +82,7 @@ to either the page, a String in 'var', or a Reader in 'varReader'. - url + targetURL true true @@ -281,7 +281,7 @@ false - url + targetURL false true @@ -346,7 +346,7 @@ - url + targetURL org.apache.taglibs.standard.tag.rt.core.UrlTag JSP diff --git a/web/WEB-INF/tld/c-1_0.tld b/web/WEB-INF/tld/c-1_0.tld index ce80e8d..aea9d26 100644 --- a/web/WEB-INF/tld/c-1_0.tld +++ b/web/WEB-INF/tld/c-1_0.tld @@ -21,7 +21,7 @@ out:default out:escapeXml if:test - import:url + import:targetURL import:context import:charEncoding forEach:items @@ -36,12 +36,12 @@ param:name param:value redirect:context - redirect:url + redirect:targetURL set:property set:target set:value - url:context - url:value + targetURL:context + targetURL:value when:test @@ -139,7 +139,7 @@ to either the page, a String in 'var', or a Reader in 'varReader'. - url + targetURL true false @@ -304,7 +304,7 @@ false - url + targetURL true false @@ -369,7 +369,7 @@ - url + targetURL org.apache.taglibs.standard.tag.el.core.UrlTag JSP diff --git a/web/WEB-INF/tld/c.tld b/web/WEB-INF/tld/c.tld index 22698c9..5ae8dd8 100644 --- a/web/WEB-INF/tld/c.tld +++ b/web/WEB-INF/tld/c.tld @@ -103,7 +103,7 @@ Scope for var. The URL of the resource to import. - url + targetURL true true @@ -403,7 +403,7 @@ Value of the parameter. The URL of the resource to redirect to. - url + targetURL false true @@ -500,13 +500,13 @@ Scope for var. Creates a URL with optional query parameters. - url + targetURL org.apache.taglibs.standard.tag.rt.core.UrlTag JSP Name of the exported scoped variable for the -processed url. The type of the scoped variable is +processed targetURL. The type of the scoped variable is String. var diff --git a/web/WEB-INF/tld/sql-1_0-rt.tld b/web/WEB-INF/tld/sql-1_0-rt.tld index c2fe525..d1b895b 100644 --- a/web/WEB-INF/tld/sql-1_0-rt.tld +++ b/web/WEB-INF/tld/sql-1_0-rt.tld @@ -170,7 +170,7 @@ true - url + targetURL false true diff --git a/web/WEB-INF/tld/sql-1_0.tld b/web/WEB-INF/tld/sql-1_0.tld index 2f8a328..4cd3e3f 100644 --- a/web/WEB-INF/tld/sql-1_0.tld +++ b/web/WEB-INF/tld/sql-1_0.tld @@ -30,7 +30,7 @@ dateParam:type setDataSource:dataSource setDataSource:driver - setDataSource:url + setDataSource:targetURL setDataSource:user setDataSource:password @@ -195,7 +195,7 @@ ue. false - url + targetURL false false diff --git a/web/WEB-INF/tld/sql.tld b/web/WEB-INF/tld/sql.tld index e53445b..4f8e76b 100644 --- a/web/WEB-INF/tld/sql.tld +++ b/web/WEB-INF/tld/sql.tld @@ -263,7 +263,7 @@ JDBC parameter: driver class name. JDBC parameter: URL associated with the database. - url + targetURL false true From db605ef91af85ae8b8550e423a16b57b833b4f88 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Mon, 14 Jan 2019 18:02:03 +0800 Subject: [PATCH 15/34] =?UTF-8?q?=E5=AE=8C=E5=96=84gdms=EF=BC=8C=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=94=A8=E6=88=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/libraries/tomcat_lib.xml | 10 ++++++++++ .idea/misc.xml | 2 +- GDMS.iml | 14 +++----------- 3 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 .idea/libraries/tomcat_lib.xml diff --git a/.idea/libraries/tomcat_lib.xml b/.idea/libraries/tomcat_lib.xml new file mode 100644 index 0000000..569121d --- /dev/null +++ b/.idea/libraries/tomcat_lib.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index df60b67..9486b47 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/GDMS.iml b/GDMS.iml index 629add7..b6ef183 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -17,18 +17,10 @@ - + - - - - - - - - - - + + \ No newline at end of file From 57893051b88d686c93f4072c72f34303526fe0ea Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Mon, 14 Jan 2019 18:20:19 +0800 Subject: [PATCH 16/34] =?UTF-8?q?=E5=AE=8C=E6=88=90teacherSearchStudent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/process/C_TeacherSearchStudent.java | 38 ++++++++++++++++---- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/src/core/process/C_TeacherSearchStudent.java b/src/core/process/C_TeacherSearchStudent.java index 4c1be5d..c915c93 100644 --- a/src/core/process/C_TeacherSearchStudent.java +++ b/src/core/process/C_TeacherSearchStudent.java @@ -13,9 +13,9 @@ public class C_TeacherSearchStudent extends TempProcess { static String table="student"; - Map StudentInfo=new HashMap(); public Map search() throws Exception{ if(!check()) throw new GExcptInit("studentId Attrs init error!"); + Map studentInfo =new HashMap<>(); Search search = new Search() ; search.setOptions(new HashMap<>()); search.addOptions("table",table); @@ -30,11 +30,37 @@ public class C_TeacherSearchStudent extends TempProcess { Map options = search.execute(null); List result = (List) options.get("result"); 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; + 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; + } + public List> _search() throws Exception{ + if(!check()) throw new GExcptInit("studentId Attrs init error!"); + Search search = new Search() ; + search.setOptions(new HashMap<>()); + search.addOptions("table",table); + List fields = new ArrayList<>(); + fields.add("*"); + search.addOptions("field",fields); + Map limits = new HashMap<>(); + limits.put("id",this.getStudentId()); + search.addOptions("limits",limits); + search.addOptions("start",0); + search.addOptions("end",1); + Map options = search.execute(null); + List result = (List) options.get("result"); + List> studentsInfo = new ArrayList<>(); + for(String[] s:result){ + Map studentInfo = new HashMap<>(); + studentInfo.put("id",s[0]); + studentInfo.put("name",s[2]); + studentInfo.put("e_mail_location",s[3]); + studentInfo.put("phone_number",s[4]); + studentsInfo.add(studentInfo); + } + return studentsInfo; } protected boolean check() { if(this.getStudentId()==null) From 0c7700e99a3c1b768efe38bc6112ba33a076c4f1 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Mon, 14 Jan 2019 20:13:26 +0800 Subject: [PATCH 17/34] =?UTF-8?q?1=E3=80=81global=5Ftime=5Fpoint=E5=A1=AB?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gdms/GlobalTimePoint.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json index 66e7376..f1d908e 100644 --- a/src/gdms/GlobalTimePoint.json +++ b/src/gdms/GlobalTimePoint.json @@ -1,3 +1,9 @@ { - "":"" + "teacher_choose_student_start_date":"";, + "student_choose_teacher_start_date": "",; + "choose_end_date": "",; + "opening_report_opinion_deadline_date": "",; + "finished_product_deadline_date": "",; + "finished_product_review_deadline_date": "",; + "reply_opition_deadline_date": ""; } \ No newline at end of file From 29de469afdf7ee95eba478f80922d5f7bc829f07 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Mon, 14 Jan 2019 20:40:55 +0800 Subject: [PATCH 18/34] =?UTF-8?q?=E5=AE=8C=E6=88=90teacherSearchStudent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../S_StudentFillTopicInformation.java | 2 +- .../{Select => }/S_StudentSelectTeacher.java | 12 ++++++---- .../S_StudentUploadOpeningReport.java | 4 ++-- .../{Select => }/S_TeacherSelectStudent.java | 12 ++++++---- src/servlet/Submit/S_ScoreSubmit.java | 15 ------------ src/servlet/Submit/S_TextSubmit.java | 23 ------------------- src/servlet/account/S_Login.java | 4 ++-- 7 files changed, 19 insertions(+), 53 deletions(-) rename src/servlet/{Submit => }/S_StudentFillTopicInformation.java (96%) rename src/servlet/{Select => }/S_StudentSelectTeacher.java (74%) rename src/servlet/{Submit => }/S_StudentUploadOpeningReport.java (95%) rename src/servlet/{Select => }/S_TeacherSelectStudent.java (73%) delete mode 100644 src/servlet/Submit/S_ScoreSubmit.java delete mode 100644 src/servlet/Submit/S_TextSubmit.java diff --git a/src/servlet/Submit/S_StudentFillTopicInformation.java b/src/servlet/S_StudentFillTopicInformation.java similarity index 96% rename from src/servlet/Submit/S_StudentFillTopicInformation.java rename to src/servlet/S_StudentFillTopicInformation.java index a71f113..9de7b1e 100644 --- a/src/servlet/Submit/S_StudentFillTopicInformation.java +++ b/src/servlet/S_StudentFillTopicInformation.java @@ -1,4 +1,4 @@ -package servlet.Submit; +package servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/src/servlet/Select/S_StudentSelectTeacher.java b/src/servlet/S_StudentSelectTeacher.java similarity index 74% rename from src/servlet/Select/S_StudentSelectTeacher.java rename to src/servlet/S_StudentSelectTeacher.java index 11ba9f3..bc76e6c 100644 --- a/src/servlet/Select/S_StudentSelectTeacher.java +++ b/src/servlet/S_StudentSelectTeacher.java @@ -1,4 +1,4 @@ -package servlet.Select; +package servlet; import core.process.C_StudentSearchTeacher; import core.process.C_StudentSelectTeacher; @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/studentselectteacher") +@WebServlet("/student-select-teacher") public class S_StudentSelectTeacher extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); @@ -17,11 +17,13 @@ public class S_StudentSelectTeacher extends HttpServlet { User user=(User)request.getSession().getAttribute("user"); String student_id=user.getId(); try { - C_StudentSelectTeacher test=new C_StudentSelectTeacher(); - test.setTeacherId(teacher_id); - test.setStudentId(student_id); + C_StudentSelectTeacher SST=new C_StudentSelectTeacher(); + SST.setTeacherId(teacher_id); + SST.setStudentId(student_id); + SST.select(); } catch (Exception e) { e.printStackTrace(); + response.sendRedirect("/op_fail.jsp"); } } } diff --git a/src/servlet/Submit/S_StudentUploadOpeningReport.java b/src/servlet/S_StudentUploadOpeningReport.java similarity index 95% rename from src/servlet/Submit/S_StudentUploadOpeningReport.java rename to src/servlet/S_StudentUploadOpeningReport.java index 78afd75..df0f052 100644 --- a/src/servlet/Submit/S_StudentUploadOpeningReport.java +++ b/src/servlet/S_StudentUploadOpeningReport.java @@ -1,4 +1,4 @@ -package servlet.Submit; +package servlet; import core.user.User; @@ -12,7 +12,7 @@ import javax.servlet.http.Part; import java.io.IOException; import java.util.UUID; -@WebServlet("/upload") +@WebServlet("/student-upload-opening-report") @MultipartConfig //学生id+文件 public class S_StudentUploadOpeningReport extends HttpServlet { diff --git a/src/servlet/Select/S_TeacherSelectStudent.java b/src/servlet/S_TeacherSelectStudent.java similarity index 73% rename from src/servlet/Select/S_TeacherSelectStudent.java rename to src/servlet/S_TeacherSelectStudent.java index 0bd9ad4..fe20103 100644 --- a/src/servlet/Select/S_TeacherSelectStudent.java +++ b/src/servlet/S_TeacherSelectStudent.java @@ -1,4 +1,4 @@ -package servlet.Select; +package servlet; import core.process.C_TeacherSelectStudent; import core.user.User; @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/teacherselectstudent") +@WebServlet("/teacher-select-student") public class S_TeacherSelectStudent extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); @@ -17,11 +17,13 @@ public class S_TeacherSelectStudent extends HttpServlet { User user=(User)request.getSession().getAttribute("user"); String teacher_id=user.getId(); try { - C_TeacherSelectStudent test=new C_TeacherSelectStudent(); - test.setTeacherId(teacher_id); - test.setStudentId(student_id); + C_TeacherSelectStudent TSS=new C_TeacherSelectStudent(); + TSS.setTeacherId(teacher_id); + TSS.setStudentId(student_id); + TSS.select(); } catch (Exception e) { e.printStackTrace(); + response.sendRedirect("/op_fail.jsp"); } } } diff --git a/src/servlet/Submit/S_ScoreSubmit.java b/src/servlet/Submit/S_ScoreSubmit.java deleted file mode 100644 index 8e8a11c..0000000 --- a/src/servlet/Submit/S_ScoreSubmit.java +++ /dev/null @@ -1,15 +0,0 @@ -package servlet.Submit; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -public class S_ScoreSubmit extends HttpServlet { - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doPost(request, response); - String score = request.getParameter("score"); - - } -} diff --git a/src/servlet/Submit/S_TextSubmit.java b/src/servlet/Submit/S_TextSubmit.java deleted file mode 100644 index f799e8a..0000000 --- a/src/servlet/Submit/S_TextSubmit.java +++ /dev/null @@ -1,23 +0,0 @@ -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("/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"); - String score=request.getParameter("score"); - try { - - - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/src/servlet/account/S_Login.java b/src/servlet/account/S_Login.java index c394db1..f7b9506 100644 --- a/src/servlet/account/S_Login.java +++ b/src/servlet/account/S_Login.java @@ -18,10 +18,10 @@ import error.GExcptSQL; @WebServlet("/login") public class S_Login extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws IOException { String id=request.getParameter("id"); String password=request.getParameter("password"); - User user = null; + User user; try { user = AccountManagement.login(id,password); } catch (GExcptSQL | SQLException gExcptSQL) { From 42369e5b496e0eff7f2254fdf4fbde442516e15f Mon Sep 17 00:00:00 2001 From: wlf <920607690@qq.com> Date: Mon, 14 Jan 2019 20:45:01 +0800 Subject: [PATCH 19/34] Merge remote-tracking branch 'remotes/origin/wmj' into wlf # Conflicts: # src/core/process/C_StudentUploadOpeningReport.java --- .../Submit/S_StudentUploadOpeningReport.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/servlet/Submit/S_StudentUploadOpeningReport.java b/src/servlet/Submit/S_StudentUploadOpeningReport.java index 78afd75..8270f8d 100644 --- a/src/servlet/Submit/S_StudentUploadOpeningReport.java +++ b/src/servlet/Submit/S_StudentUploadOpeningReport.java @@ -1,5 +1,6 @@ package servlet.Submit; +import core.process.C_StudentUploadOpeningReport; import core.user.User; import javax.servlet.ServletException; @@ -9,6 +10,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Part; +import java.io.File; import java.io.IOException; import java.util.UUID; @@ -19,25 +21,6 @@ public class S_StudentUploadOpeningReport extends HttpServlet { private static final long serialVersionUID = 1L; protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); - User user=(User) request.getSession().getAttribute("user"); - String student_id=user.getId(); - try { - - //获取上传的文件 - Part part=request.getPart("file"); - //获取请求的信息 - String name=part.getHeader("content-disposition"); - //获取上传文件的目录 - String root=request.getServletContext().getRealPath("/upload"); - - - request.setAttribute("info", "上传文件成功"); - } catch (Exception e) { - e.printStackTrace(); - request.setAttribute("info", "上传文件失败"); - } - - request.getRequestDispatcher("/upload.jsp").forward(request, response); } } From 6a2ba9bc6fac2cdfd31444f1389955c0211cc63f Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Mon, 14 Jan 2019 21:03:14 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E5=AE=8C=E6=88=90teacherSearchStudent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../S_CollegeFillOpeningReportOpinion.java | 19 +++++++++++++++++++ src/servlet/S_CollegeFillScoreOpinion.java | 19 +++++++++++++++++++ .../S_MentorFillOpeningReportOpinion.java | 19 +++++++++++++++++++ src/servlet/S_MentorFillReview.java | 19 +++++++++++++++++++ src/servlet/S_ReviewerFillReview.java | 19 +++++++++++++++++++ src/servlet/S_SchoolFillScoreOpinion.java | 19 +++++++++++++++++++ .../S_SecretaryFillOpeningReportRecord.java | 19 +++++++++++++++++++ src/servlet/S_SecretaryFillReplyRecord.java | 19 +++++++++++++++++++ ...udentFillGraduationDesignInformation.java} | 4 +++- .../S_StudentUploadFinishedProduct.java | 19 +++++++++++++++++++ .../S_TeacherFillTeamFillScoreOpinion.java | 19 +++++++++++++++++++ ...S_TeacherTeamFillOpeningReportOpinion.java | 19 +++++++++++++++++++ 12 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 src/servlet/S_CollegeFillOpeningReportOpinion.java create mode 100644 src/servlet/S_CollegeFillScoreOpinion.java create mode 100644 src/servlet/S_MentorFillOpeningReportOpinion.java create mode 100644 src/servlet/S_MentorFillReview.java create mode 100644 src/servlet/S_ReviewerFillReview.java create mode 100644 src/servlet/S_SchoolFillScoreOpinion.java create mode 100644 src/servlet/S_SecretaryFillOpeningReportRecord.java create mode 100644 src/servlet/S_SecretaryFillReplyRecord.java rename src/servlet/{S_StudentFillTopicInformation.java => S_StudentFillGraduationDesignInformation.java} (77%) create mode 100644 src/servlet/S_StudentUploadFinishedProduct.java create mode 100644 src/servlet/S_TeacherFillTeamFillScoreOpinion.java create mode 100644 src/servlet/S_TeacherTeamFillOpeningReportOpinion.java diff --git a/src/servlet/S_CollegeFillOpeningReportOpinion.java b/src/servlet/S_CollegeFillOpeningReportOpinion.java new file mode 100644 index 0000000..774b28f --- /dev/null +++ b/src/servlet/S_CollegeFillOpeningReportOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_CollegeFillOpeningReportOpinion") +public class S_CollegeFillOpeningReportOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java new file mode 100644 index 0000000..e937d1d --- /dev/null +++ b/src/servlet/S_CollegeFillScoreOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_CollegeFillScoreOpinion") +public class S_CollegeFillScoreOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_MentorFillOpeningReportOpinion.java b/src/servlet/S_MentorFillOpeningReportOpinion.java new file mode 100644 index 0000000..409ff1f --- /dev/null +++ b/src/servlet/S_MentorFillOpeningReportOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_MentorFillOpeningReportOpinion") +public class S_MentorFillOpeningReportOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_MentorFillReview.java b/src/servlet/S_MentorFillReview.java new file mode 100644 index 0000000..732bf0e --- /dev/null +++ b/src/servlet/S_MentorFillReview.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_MentorFillReview") +public class S_MentorFillReview extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_ReviewerFillReview.java b/src/servlet/S_ReviewerFillReview.java new file mode 100644 index 0000000..437556e --- /dev/null +++ b/src/servlet/S_ReviewerFillReview.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_ReviewerFillReview") +public class S_ReviewerFillReview extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_SchoolFillScoreOpinion.java b/src/servlet/S_SchoolFillScoreOpinion.java new file mode 100644 index 0000000..4ece4f4 --- /dev/null +++ b/src/servlet/S_SchoolFillScoreOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_SchoolFillScoreOpinion") +public class S_SchoolFillScoreOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_SecretaryFillOpeningReportRecord.java b/src/servlet/S_SecretaryFillOpeningReportRecord.java new file mode 100644 index 0000000..74926a9 --- /dev/null +++ b/src/servlet/S_SecretaryFillOpeningReportRecord.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_SecretaryFillOpeningReportRecord") +public class S_SecretaryFillOpeningReportRecord extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_SecretaryFillReplyRecord.java b/src/servlet/S_SecretaryFillReplyRecord.java new file mode 100644 index 0000000..ea217f6 --- /dev/null +++ b/src/servlet/S_SecretaryFillReplyRecord.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_SecretaryFillReplyRecord") +public class S_SecretaryFillReplyRecord extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_StudentFillTopicInformation.java b/src/servlet/S_StudentFillGraduationDesignInformation.java similarity index 77% rename from src/servlet/S_StudentFillTopicInformation.java rename to src/servlet/S_StudentFillGraduationDesignInformation.java index 9de7b1e..142b43d 100644 --- a/src/servlet/S_StudentFillTopicInformation.java +++ b/src/servlet/S_StudentFillGraduationDesignInformation.java @@ -1,12 +1,14 @@ package servlet; 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; -public class S_StudentFillTopicInformation extends HttpServlet { +@WebServlet("/student-fill-graduation-design-information") +public class S_StudentFillGraduationDesignInformation extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); String content1=new String(request.getParameter("text").getBytes("ISO8859-1"),"UTF-8"); diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java new file mode 100644 index 0000000..0389973 --- /dev/null +++ b/src/servlet/S_StudentUploadFinishedProduct.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_StudentUploadFinishedProduct") +public class S_StudentUploadFinishedProduct extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_TeacherFillTeamFillScoreOpinion.java b/src/servlet/S_TeacherFillTeamFillScoreOpinion.java new file mode 100644 index 0000000..e3418ef --- /dev/null +++ b/src/servlet/S_TeacherFillTeamFillScoreOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_TeacherFillTeamFillScoreOpinion") +public class S_TeacherFillTeamFillScoreOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} diff --git a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java new file mode 100644 index 0000000..ac47c5b --- /dev/null +++ b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java @@ -0,0 +1,19 @@ +package servlet; + +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(name = "S_TeacherTeamFillOpeningReportOpinion") +public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} From 0ac675d119576a0681793183c272a85b446dfc36 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Mon, 14 Jan 2019 21:05:08 +0800 Subject: [PATCH 21/34] Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts. --- web/cssFile/blank-style.css | 94 +++++++++++++++++++++++++++++++++ web/cssFile/fill-style.css | 9 ---- web/cssFile/home.css | 15 +++++- web/cssFile/images/filText.png | Bin 0 -> 334 bytes web/cssFile/personal.css | 3 +- web/cssFile/select-style.css | 12 ++--- web/fillSbjMsg.jsp | 65 +++++++++++++++++++++++ web/fill_Information.jsp | 30 +++++++---- web/home.jsp | 12 ++++- web/jsFile/fill-action.js | 3 +- web/jsFile/homeActive.js | 6 ++- web/jsFile/search.js | 25 +++++---- web/jsFile/sub-msg-input.js | 33 ++++++++++++ web/jsFile/upload_action.js | 2 + web/select.jsp | 74 ++++++++++++++++---------- 15 files changed, 309 insertions(+), 74 deletions(-) create mode 100644 web/cssFile/blank-style.css create mode 100644 web/cssFile/images/filText.png create mode 100644 web/fillSbjMsg.jsp create mode 100644 web/jsFile/sub-msg-input.js diff --git a/web/cssFile/blank-style.css b/web/cssFile/blank-style.css new file mode 100644 index 0000000..fa2bd36 --- /dev/null +++ b/web/cssFile/blank-style.css @@ -0,0 +1,94 @@ +.blank-frame-sub{ + width: 100%; + min-height: 825px; + border: 1px solid rgba(255, 255, 255, 0); + } +.sub-msg{ + background-color: white; + width: 960px; + min-height: 400px; + border-radius: 5px; + margin: 100px 10px 0px 18px; + border: 1px solid rgba(0, 0, 0, 0.23); +} +.sub-fill-frame{ + height: 80px; + width: 940px; + margin: 20px 10px; +} +.sub-fill-frame input{ + float: left; + margin-right: 10px; + padding-left: 12px; + background-color: #f5f5f5; + border-radius: 5px; + height: 40px; + width: 300px; + border:1px solid rgba(0, 0, 0, 0.27); +} +.sub-fill-frame input:hover{ + border:1px solid rgb(120, 190, 255); + background-color: #ffffff; +} +.sub-fill-frame input:focus{ + border:1px solid rgb(120, 190, 255); + background-color: #ffffff; +} +.sub-fill-frame select{ + appearance:none; + -moz-appearance:none; + -webkit-appearance:none; + width: 150px; + height: 40px; + color: rgba(0,0,0,0.58); + border:1px solid rgba(0, 0, 0, 0.41); + padding-left: 12px; + border-radius: 5px; +} +.sub-scb-text{ + width: 700px; + height: 120px; + border-radius: 10px; + border: 1px solid rgba(0, 0, 0, 0.2); + resize: none; + padding: 10px 10px; + background-color: #f4f4f4; +} +.sub-scb-text:focus{ + border: 1px solid rgb(55, 157, 255); + background-color: white; +} +.sub-scb-text:hover{ + background-color: white; + border: 1px solid rgb(55, 157, 255); +} +.sub-fill-frame.sub-scb{ + height:120px ; +} +.sub-tips{ + text-align: right; + line-height: 40px; + margin-right: 20px; + width: 150px; + height: 100%; + float: left; +} +.sub-input-button{ + width: 100px; + height: 40px; + color: white; + background-color: #d74144; + border-radius: 5px; + margin: 20px 430px; + border: 0px; + cursor: pointer; +} +.sub-input-button:hover{ + background-color: #eb4548; +} +.sub-fill-frame select:focus{ + border: 1px solid rgb(55, 157, 255); +} +.sub-fill-frame select:hover{ + border: 1px solid rgb(55, 157, 255); +} \ No newline at end of file diff --git a/web/cssFile/fill-style.css b/web/cssFile/fill-style.css index aa4a574..e63055f 100644 --- a/web/cssFile/fill-style.css +++ b/web/cssFile/fill-style.css @@ -119,12 +119,3 @@ right: 220px; padding-left: 15px; } -.fill-top-blank{ - border-radius: 5px; - height: 70px; - width: 960px; - position: absolute; - top: 20px; - right: 10px; - background-color: #323232; -} diff --git a/web/cssFile/home.css b/web/cssFile/home.css index b16aac0..f0985a6 100644 --- a/web/cssFile/home.css +++ b/web/cssFile/home.css @@ -5,6 +5,15 @@ body{ width: 100%; height: 100%; } +.fill-top-blank{ + border-radius: 5px; + height: 70px; + width: 960px; + position: absolute; + top: 20px; + right: 10px; + background-color: #323232; +} .main2{ background-color:#fafafa; } @@ -410,14 +419,16 @@ ul{ color: #7b7b7b; } .model-info{ + text-align: center; float: left; - width: 100px; + width: 400px; height: 40px; margin: 15px 10px; background-color: #e4e4e4; border-radius: 5px; - color: #1b1b1b; + color: rgba(27, 27, 27, 0.87); padding-left: 10px; line-height: 35px; font-size: 18px; + font-weight: 400; } \ No newline at end of file diff --git a/web/cssFile/images/filText.png b/web/cssFile/images/filText.png new file mode 100644 index 0000000000000000000000000000000000000000..6859d43942a7d1ad062652d828d98faf1021c011 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^DImNOnpBiKW%F@3H=U`tkC)rO!&w z-7`-)kEetd?^(QZ#Hj!Xc#W(W3xlSnRZ@ILk?_F<`3-x0xSn s0h@5<2j9o~565SKoxlk8PDA}SroC%qyHlp~y#@(*y85}Sb4q9e0N1T{j{pDw literal 0 HcmV?d00001 diff --git a/web/cssFile/personal.css b/web/cssFile/personal.css index c621e6a..623656e 100644 --- a/web/cssFile/personal.css +++ b/web/cssFile/personal.css @@ -41,9 +41,8 @@ ul{ top: 70px; left: 250px; width: 600px; - border: 1px solid rgba(0, 0, 0, 0.27); + border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 5px; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.23); } .personal-msg-frame .personal-msg-part{ width: 100%; diff --git a/web/cssFile/select-style.css b/web/cssFile/select-style.css index d06576a..ac9a999 100644 --- a/web/cssFile/select-style.css +++ b/web/cssFile/select-style.css @@ -77,6 +77,9 @@ a{ border: 0px; transition: all 0.3s; } +.select-it.on{ + background-color: rgba(88, 137, 238, 0.97); +} .select-it:hover{ width: 100px; } @@ -161,13 +164,4 @@ a{ } .one-msg:hover{ background-color: rgba(39, 39, 39, 0.78); -} -.top-blank{ - position: absolute; - height: 70px; - width: 960px; - top: 20px; - left: 20px; - background-color: #323232; - border-radius: 5px; } \ No newline at end of file diff --git a/web/fillSbjMsg.jsp b/web/fillSbjMsg.jsp new file mode 100644 index 0000000..422ac55 --- /dev/null +++ b/web/fillSbjMsg.jsp @@ -0,0 +1,65 @@ +<%-- + Created by IntelliJ IDEA. + User: lenovo + Date: 2019/1/14 + Time: 15:53 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + 填写选题信息 + + + + + +
+
+
填写选题信息
+ +
+
+
+
论文题目:
+ + +
+
+
题目类别:
+ +
+
+
题目来源:
+ +
+
+
题目性质:
+ +
+
+
题目描述:
+ +
+ +
+
+
+
+
+ + diff --git a/web/fill_Information.jsp b/web/fill_Information.jsp index d276c4a..f3ae370 100644 --- a/web/fill_Information.jsp +++ b/web/fill_Information.jsp @@ -1,6 +1,8 @@ <%@ page import="core.user.User" %> <%@ page import="java.util.Map" %> -<%@ page import="java.util.HashMap" %><%-- +<%@ page import="java.util.HashMap" %> +<%@ page import="java.util.List" %> +<%@ page import="java.util.ArrayList" %><%-- Created by IntelliJ IDEA. User: lenovo Date: 2019/1/12 @@ -17,15 +19,19 @@ -<%Map map2=new HashMap(); +<% + Map map2=new HashMap(); + Map map3=new HashMap(); map2.put("姓名","李先生"); map2.put("学号","201630126050"); map2.put("电话","18711191679"); - map2.put("题目","论文"); - map2.put("5","李先生2"); - map2.put("6","李先生2"); + map3.put("姓名","王先生"); + map3.put("学号","201630126051"); + map3.put("电话","18711191679"); + List> list=new ArrayList>(); pageContext.setAttribute("map",map2); - String type ="student"; + User user=(User)session.getAttribute("user"); + String type=user.getType(); pageContext.setAttribute("type",type); %>
@@ -33,16 +39,18 @@
${map.姓名}
-
-
+ +
+
+
${z.key}:${z.value}
-
- - + + + diff --git a/web/home.jsp b/web/home.jsp index c68ff37..56d3d00 100644 --- a/web/home.jsp +++ b/web/home.jsp @@ -16,6 +16,7 @@ + @@ -23,6 +24,7 @@ + <%String type="teacher";pageContext.setAttribute("userType",type);%> @@ -40,7 +42,7 @@
个人信息
-
退出登录
+
退出登录
@@ -91,6 +93,14 @@
上传文件
+
+ +
+ +
+
填写选题信息
+ +
diff --git a/web/jsFile/fill-action.js b/web/jsFile/fill-action.js index 7193b17..d7dd3bc 100644 --- a/web/jsFile/fill-action.js +++ b/web/jsFile/fill-action.js @@ -2,7 +2,8 @@ $(document).ready(function () { $(document).off('click',submit_text).on('click','.submit-text',submit_text); }) function submit_text() { - var Url3='testfrom.jsp'; + var Url3=$(this).parent().attr("action"); + alert(Url3); var fillDate=$(this).parent().serialize(); var upddateit=$('.updated'); alert(fillDate); diff --git a/web/jsFile/homeActive.js b/web/jsFile/homeActive.js index 933c1f7..027511c 100644 --- a/web/jsFile/homeActive.js +++ b/web/jsFile/homeActive.js @@ -1,6 +1,6 @@ $(document).ready(function () { $('.a-process').on('click',moveBar); - $('.update-to-perm').on('click',upadateFrame); + $('.update-to-perm').on('click',showPerMsg); $('.notice-child').on('mouseenter',shownoticeText).on('mouseleave',hideText); }) function moveBar() { @@ -53,4 +53,8 @@ function shownoticeText() { } function hideText() { $(this).removeClass("select"); +} +function showPerMsg(e) { + e.preventDefault(); + $('.link-point').eq(0).click(); } \ No newline at end of file diff --git a/web/jsFile/search.js b/web/jsFile/search.js index 5801730..c4482c1 100644 --- a/web/jsFile/search.js +++ b/web/jsFile/search.js @@ -1,7 +1,8 @@ $(document).ready(function () { $(document).off('click',searchmsg).on('click','.search-button',searchmsg); $(document).off('keydown',searchmsg).on('keydown','.search-input',KDsearchmsg); - $(document).off('click',select_one).on('click','.select-it',select_one); + $(document).off('click',teacherSelect).on('click','.select-it.teacher',teacherSelect); + $(document).off('click',studentSelect).on('click','.select-it.teacher',studentSelect); }) function searchmsg(e) { if($('.search-input').val()=='') @@ -22,16 +23,22 @@ function KDsearchmsg(e) { searchmsg(e); } } -function select_one() { - var id=$(this).val(); - var button=$(this); +function select_one(Url2,button) { + var id=button.val(); var selectDate={"id":id}; - var Url2='testfrom.jsp'; - $.post(Url2,selectDate,function (data,status) { + if(button.html()!="已选") + {$.post(Url2,selectDate,function (data,status) { if(status=='success') { - button.css('background-color','rgba(88, 137, 238, 0.97)') - .html("已选") + button.addClass('on').html("已选"); } - }); + })} +} +function studentSelect() { + var button=$(this); + select_one("testfrom.jsp",button); +} +function teacherSelect() { + var button=$(this); + select_one("testfrom.jsp",button); } \ No newline at end of file diff --git a/web/jsFile/sub-msg-input.js b/web/jsFile/sub-msg-input.js new file mode 100644 index 0000000..f01d9bb --- /dev/null +++ b/web/jsFile/sub-msg-input.js @@ -0,0 +1,33 @@ +$(document).ready( + function () { + $(document).off('click',sendSub).on('click','.sub-input-button',sendSub); + } +) +function sendSub() { + var Url3='testfrom.jsp'; + if( $('.sub-input').eq(0).val()==''|| $('.sub-input').eq(1).val()=='' + || $('.sub-input').eq(2).val()=='') + { + alert("请将信息填写完整"); + return; + } + + if( $('.sub-select').eq(0).val()==''|| $('.sub-select').eq(1).val()=='') + { + alert("请将信息填写完整"); + return; + } + if($('.sub-scb-text').val()=='') + { + alert("请将信息填写完整"); + return; + } + var fillDate=$(this).parent().serialize(); + $.post(Url3,fillDate,function(data,status) { + if(status=='success') + { + alert("提交成功"); + } + } + ); +} \ No newline at end of file diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js index 3e08fba..c3214c9 100644 --- a/web/jsFile/upload_action.js +++ b/web/jsFile/upload_action.js @@ -41,4 +41,6 @@ function showMsg() { $('.file-name').html(filename); $('.file-msg').css("left","340px"); $('.file-input-frame').css("right","20px") + $('.select-file').html("重新选择"); + $('.select-file').css("background-color","#eb4548"); } \ No newline at end of file diff --git a/web/select.jsp b/web/select.jsp index 238b1ed..9bbf45f 100644 --- a/web/select.jsp +++ b/web/select.jsp @@ -6,6 +6,14 @@ To change this template use File | Settings | File Templates. --%> <%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.Date" %> +<%@ page import="core.user.User" %> +<%@ page import="java.util.Map" %> +<%@ page import="java.util.HashMap" %> +<%@ page import="java.util.List" %> +<%@ page import="java.util.ArrayList" %> +<%@ page import="core.process.C_TeacherSearchStudent" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> Title @@ -14,10 +22,36 @@ +<% + Map map1=new HashMap(); + Map map2=new HashMap<>(); + map1.put("姓名","hehcu"); + map1.put("学号","201630126050"); + map1.put("电话","18711191679"); + map1.put("状态","选择"); + map2.put("姓名","laoshi"); + map2.put("学号","54646546"); + map2.put("电话","18711191679"); + map2.put("状态","已选"); + List> list=new ArrayList<>(); + list.add(map1); + list.add(map2); + pageContext.setAttribute("list",list); + User user=(User)session.getAttribute("user"); + String type=user.getType(); + pageContext.setAttribute("type",type); +%>
-
-
选择学生
+
+
+ + ${"选择学生"} + + + ${"选择老师"} + +
@@ -28,37 +62,19 @@
-
+
+
-
李先生
+
${z.姓名}
-
电话号码：18711191679
-
邮箱：823169880@qq.com
-
年级：2016
-
专业：软件工程
-
电话号码：18711191679
-
邮箱：823169880@qq.com
+ +
${msg.key}：${msg.value}
+
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- +
+
From 3082be06482ea8d1b471c338bc1c6728e9536448 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Mon, 14 Jan 2019 21:07:01 +0800 Subject: [PATCH 22/34] globalTimePoint --- src/gdms/GlobalTimePoint.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json index f1d908e..b5d8112 100644 --- a/src/gdms/GlobalTimePoint.json +++ b/src/gdms/GlobalTimePoint.json @@ -1,9 +1,9 @@ { - "teacher_choose_student_start_date":"";, - "student_choose_teacher_start_date": "",; - "choose_end_date": "",; - "opening_report_opinion_deadline_date": "",; - "finished_product_deadline_date": "",; - "finished_product_review_deadline_date": "",; - "reply_opition_deadline_date": ""; + "teacher_choose_student_start_date":"", + "student_choose_teacher_start_date": "", + "choose_end_date": "", + "opening_report_opinion_deadline_date": "", + "finished_product_deadline_date": "", + "finished_product_review_deadline_date": "", + "reply_opition_deadline_date": "" } \ No newline at end of file From b8af9db37ab4ca3d03d348801103101f1a1dd628 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Mon, 14 Jan 2019 21:07:11 +0800 Subject: [PATCH 23/34] globalTimePoint --- src/gdms/GlobalTimePoint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json index b5d8112..97d7da8 100644 --- a/src/gdms/GlobalTimePoint.json +++ b/src/gdms/GlobalTimePoint.json @@ -5,5 +5,5 @@ "opening_report_opinion_deadline_date": "", "finished_product_deadline_date": "", "finished_product_review_deadline_date": "", - "reply_opition_deadline_date": "" + "reply_option_deadline_date": "" } \ No newline at end of file From d2b9c841e1b1fe3eb049a1d02f32d135eea3d340 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Mon, 14 Jan 2019 21:11:07 +0800 Subject: [PATCH 24/34] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Process?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml | 1085 +++++++++-------- .idea/misc.xml | 2 +- .../C_CollegeFillOpeningReportOpinion.java | 4 + ... => C_MentorFillOpeningReportOpinion.java} | 2 +- .../process/C_StudentUploadOpeningReport.java | 4 +- 5 files changed, 559 insertions(+), 538 deletions(-) create mode 100644 src/core/process/C_CollegeFillOpeningReportOpinion.java rename src/core/process/{C_TeacherFillTopicInformation.java => C_MentorFillOpeningReportOpinion.java} (96%) diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml index 3473dc6..dc24536 100644 --- a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml @@ -1,9 +1,9 @@ - + - 10.3.10 - MARIADB + 10.2.18 + MariaDB InnoDB lower/lower @@ -22,2120 +22,2137 @@ 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 + char(20)|0s normal - + 3 - text|0s + float|0s normal - + 4 - date|0s + text|0s normal - + 5 + date|0s + normal + + + 6 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 - - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 - text|0s + char(20)|0s normal - + 3 - date|0s + text|0s normal - + 4 - text|0s + date|0s normal - + 5 - date|0s + text|0s normal - + 6 - text|0s + date|0s normal - + 7 - date|0s + text|0s normal - + 8 - text|0s + date|0s normal - + 9 + text|0s + normal + + + 10 date|0s normal - + + 11 + char(1)|0s + normal + + + 12 + char(1)|0s + normal + + + 13 + char(1)|0s + normal + + + 14 + char(1)|0s + normal + + 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 + char(20)|0s normal - + 3 - date|0s + char(20)|0s normal - + 4 text|0s normal - + 5 date|0s normal - + 6 text|0s normal - + 7 - float|0s + date|0s normal - + 8 - date|0s + text|0s normal - + 9 - text|0s + float|0s normal - + 10 - float|0s + date|0s normal - + 11 - date|0s + text|0s normal - + 12 - text|0s + float|0s normal - + 13 - float|0s + date|0s normal - + 14 - date|0s + text|0s normal - + 15 - char(1)|0s + float|0s normal - + 16 - char(1)|0s + date|0s normal - + 17 char(1)|0s normal - + 18 char(1)|0s normal - + + 19 + char(1)|0s + normal + + + 20 + 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/misc.xml b/.idea/misc.xml index 9486b47..df60b67 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/src/core/process/C_CollegeFillOpeningReportOpinion.java b/src/core/process/C_CollegeFillOpeningReportOpinion.java new file mode 100644 index 0000000..4e93675 --- /dev/null +++ b/src/core/process/C_CollegeFillOpeningReportOpinion.java @@ -0,0 +1,4 @@ +package core.process; + +public class C_CollegeFillOpeningReportOpinion { +} diff --git a/src/core/process/C_TeacherFillTopicInformation.java b/src/core/process/C_MentorFillOpeningReportOpinion.java similarity index 96% rename from src/core/process/C_TeacherFillTopicInformation.java rename to src/core/process/C_MentorFillOpeningReportOpinion.java index 6d72cd4..1db9c1b 100644 --- a/src/core/process/C_TeacherFillTopicInformation.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -7,7 +7,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -public class C_TeacherFillTopicInformation extends TempProcess{ +public class C_MentorFillOpeningReportOpinion extends TempProcess{ String StudentId; String mentor_opinion; diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java index 88ed26e..c2bb813 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -1,6 +1,6 @@ package core.process; -import core.operation.UploadFileOperation; +import core.operation.UploadFile; import error.GExcptInit; import java.io.File; @@ -15,7 +15,7 @@ public class C_StudentUploadOpeningReport extends TempProcess{ public void uploadOpeningReport() throws Exception{ if(!check()) throw new GExcptInit("Upload OpeningReport Attrs init error!"); - UploadFileOperation uploadFileOperation=new UploadFileOperation(); + UploadFile uploadFileOperation=new UploadFile(); uploadFileOperation.setOptions(new HashMap<>()); uploadFileOperation.addOptions("file",this.getOpeningReport()); uploadFileOperation.addOptions("file_type",file_type); From 687ce0df5bd7b4a0e6f26a9dbe5d932315cd007c Mon Sep 17 00:00:00 2001 From: wlf <920607690@qq.com> Date: Mon, 14 Jan 2019 21:11:54 +0800 Subject: [PATCH 25/34] Merge remote-tracking branch 'remotes/origin/wmj' into wlf # Conflicts: # src/core/process/C_StudentUploadOpeningReport.java --- .idea/misc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 9486b47..df60b67 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file From 2bd6e8c4c993901b8a43936b825633c55317084e Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Mon, 14 Jan 2019 22:34:13 +0800 Subject: [PATCH 26/34] =?UTF-8?q?S=5FServlet=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../process/C_StudentUploadOpeningReport.java | 28 +++++++++---------- .../C_TeacherFillTopicInformation.java | 6 ++-- .../S_CollegeFillOpeningReportOpinion.java | 12 ++++---- src/servlet/S_CollegeFillScoreOpinion.java | 12 ++++---- .../S_MentorFillOpeningReportOpinion.java | 12 ++++---- src/servlet/S_MentorFillReview.java | 12 ++++---- src/servlet/S_ReviewerFillReview.java | 12 ++++---- src/servlet/S_SchoolFillScoreOpinion.java | 12 ++++---- .../S_SecretaryFillOpeningReportRecord.java | 12 ++++---- src/servlet/S_SecretaryFillReplyRecord.java | 12 ++++---- ...tudentFillGraduationDesignInformation.java | 20 ++++++++----- src/servlet/S_StudentSelectTeacher.java | 8 +++--- .../S_StudentUploadFinishedProduct.java | 8 ++---- src/servlet/S_TeacherSelectStudent.java | 8 +++--- ...S_TeacherTeamFillOpeningReportOpinion.java | 14 ++++++---- .../S_TeacherTeamFillScoreOpinion.java | 14 ++++++---- src/servlet/Utils.java | 14 ++++++++++ 18 files changed, 128 insertions(+), 90 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 9486b47..11bca97 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java index 88ed26e..736c2fb 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -1,6 +1,6 @@ package core.process; -import core.operation.UploadFileOperation; +import core.operation.UploadFile; import error.GExcptInit; import java.io.File; @@ -9,24 +9,24 @@ import java.util.Map; public class C_StudentUploadOpeningReport extends TempProcess{ File openingReport; - String gaduationDesignId; + String graduationDesignId; 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); + UploadFile uploadFile=new UploadFile(); + uploadFile.setOptions(new HashMap<>()); + uploadFile.addOptions("file",this.getOpeningReport()); + uploadFile.addOptions("file_type",file_type); Maplimits = new HashMap<>(); - limits.put("id",this.getGaduationDesignId()); - uploadFileOperation.addOptions("limits",limits); - uploadFileOperation.execute(null); + limits.put("id",this.getGraduationDesignId()); + uploadFile.addOptions("limits",limits); + uploadFile.execute(null); } protected boolean check() { - if(this.getGaduationDesignId()==null||this.getOpeningReport()==null) + if(this.getGraduationDesignId()==null||this.getOpeningReport()==null) return false; return true; } @@ -39,11 +39,11 @@ public class C_StudentUploadOpeningReport extends TempProcess{ this.openingReport = openingReport; } - public String getGaduationDesignId() { - return gaduationDesignId; + public String getGraduationDesignId() { + return graduationDesignId; } - public void setGaduationDesignId(String gaduationDesignId) { - this.gaduationDesignId = gaduationDesignId; + public void setGraduationDesignId(String graduationDesignId) { + this.graduationDesignId = graduationDesignId; } } diff --git a/src/core/process/C_TeacherFillTopicInformation.java b/src/core/process/C_TeacherFillTopicInformation.java index 6d72cd4..fe0b59c 100644 --- a/src/core/process/C_TeacherFillTopicInformation.java +++ b/src/core/process/C_TeacherFillTopicInformation.java @@ -9,7 +9,7 @@ import java.util.Map; public class C_TeacherFillTopicInformation extends TempProcess{ - String StudentId; + String studentId; String mentor_opinion; Date mentor_opinion_date; @@ -36,11 +36,11 @@ public class C_TeacherFillTopicInformation extends TempProcess{ return true; } public String getStudentId() { - return StudentId; + return studentId; } public void setStudentId(String studentId) { - StudentId = studentId; + this.studentId = studentId; } public String getMentor_opinion() { return mentor_opinion; diff --git a/src/servlet/S_CollegeFillOpeningReportOpinion.java b/src/servlet/S_CollegeFillOpeningReportOpinion.java index 774b28f..6162fa5 100644 --- a/src/servlet/S_CollegeFillOpeningReportOpinion.java +++ b/src/servlet/S_CollegeFillOpeningReportOpinion.java @@ -6,14 +6,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; @WebServlet(name = "S_CollegeFillOpeningReportOpinion") public class S_CollegeFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } -} + static String[] vName = { + "" + }; +} \ No newline at end of file diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java index e937d1d..0d25745 100644 --- a/src/servlet/S_CollegeFillScoreOpinion.java +++ b/src/servlet/S_CollegeFillScoreOpinion.java @@ -6,14 +6,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; @WebServlet(name = "S_CollegeFillScoreOpinion") public class S_CollegeFillScoreOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } -} + static String[] vName = { + "" + }; +} \ No newline at end of file diff --git a/src/servlet/S_MentorFillOpeningReportOpinion.java b/src/servlet/S_MentorFillOpeningReportOpinion.java index 409ff1f..625520f 100644 --- a/src/servlet/S_MentorFillOpeningReportOpinion.java +++ b/src/servlet/S_MentorFillOpeningReportOpinion.java @@ -6,14 +6,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; @WebServlet(name = "S_MentorFillOpeningReportOpinion") public class S_MentorFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } -} + static String[] vName = { + "" + }; +} \ No newline at end of file diff --git a/src/servlet/S_MentorFillReview.java b/src/servlet/S_MentorFillReview.java index 732bf0e..f28b2d1 100644 --- a/src/servlet/S_MentorFillReview.java +++ b/src/servlet/S_MentorFillReview.java @@ -6,14 +6,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; @WebServlet(name = "S_MentorFillReview") public class S_MentorFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } -} + static String[] vName = { + "" + }; +} \ No newline at end of file diff --git a/src/servlet/S_ReviewerFillReview.java b/src/servlet/S_ReviewerFillReview.java index 437556e..a23d80a 100644 --- a/src/servlet/S_ReviewerFillReview.java +++ b/src/servlet/S_ReviewerFillReview.java @@ -6,14 +6,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; @WebServlet(name = "S_ReviewerFillReview") public class S_ReviewerFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } -} + static String[] vName = { + "" + }; +} \ No newline at end of file diff --git a/src/servlet/S_SchoolFillScoreOpinion.java b/src/servlet/S_SchoolFillScoreOpinion.java index 4ece4f4..97d7cd5 100644 --- a/src/servlet/S_SchoolFillScoreOpinion.java +++ b/src/servlet/S_SchoolFillScoreOpinion.java @@ -6,14 +6,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; @WebServlet(name = "S_SchoolFillScoreOpinion") public class S_SchoolFillScoreOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } -} + static String[] vName = { + "" + }; +} \ No newline at end of file diff --git a/src/servlet/S_SecretaryFillOpeningReportRecord.java b/src/servlet/S_SecretaryFillOpeningReportRecord.java index 74926a9..0fc9fb5 100644 --- a/src/servlet/S_SecretaryFillOpeningReportRecord.java +++ b/src/servlet/S_SecretaryFillOpeningReportRecord.java @@ -6,14 +6,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; @WebServlet(name = "S_SecretaryFillOpeningReportRecord") public class S_SecretaryFillOpeningReportRecord extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } -} + static String[] vName = { + "" + }; +} \ No newline at end of file diff --git a/src/servlet/S_SecretaryFillReplyRecord.java b/src/servlet/S_SecretaryFillReplyRecord.java index ea217f6..7b20ab4 100644 --- a/src/servlet/S_SecretaryFillReplyRecord.java +++ b/src/servlet/S_SecretaryFillReplyRecord.java @@ -6,14 +6,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; -@WebServlet(name = "S_SecretaryFillReplyRecord") +@WebServlet(name = "secretary-fill-reply-record") public class S_SecretaryFillReplyRecord extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } + static String[] vName = { + "" + }; } diff --git a/src/servlet/S_StudentFillGraduationDesignInformation.java b/src/servlet/S_StudentFillGraduationDesignInformation.java index 142b43d..d91779c 100644 --- a/src/servlet/S_StudentFillGraduationDesignInformation.java +++ b/src/servlet/S_StudentFillGraduationDesignInformation.java @@ -1,23 +1,29 @@ package servlet; +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; +import java.util.Map; @WebServlet("/student-fill-graduation-design-information") public class S_StudentFillGraduationDesignInformation extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doPost(request, response); - String content1=new String(request.getParameter("text").getBytes("ISO8859-1"),"UTF-8"); - String content2=request.getParameter("score"); - try { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); - } catch (Exception e) { - e.printStackTrace(); - } } + static String[] vName = { + "chinese_name", + "english_name", + "type_of_topic", + "source_of_design", + "nature_of_design", + "description_of_topic" + }; } diff --git a/src/servlet/S_StudentSelectTeacher.java b/src/servlet/S_StudentSelectTeacher.java index bc76e6c..69b8893 100644 --- a/src/servlet/S_StudentSelectTeacher.java +++ b/src/servlet/S_StudentSelectTeacher.java @@ -13,13 +13,13 @@ import java.io.IOException; public class S_StudentSelectTeacher extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); - String teacher_id=request.getParameter("id"); + String teacherId=request.getParameter("id"); User user=(User)request.getSession().getAttribute("user"); - String student_id=user.getId(); + String studentId=user.getId(); try { C_StudentSelectTeacher SST=new C_StudentSelectTeacher(); - SST.setTeacherId(teacher_id); - SST.setStudentId(student_id); + SST.setTeacherId(teacherId); + SST.setStudentId(studentId); SST.select(); } catch (Exception e) { e.printStackTrace(); diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java index 0389973..9eaec19 100644 --- a/src/servlet/S_StudentUploadFinishedProduct.java +++ b/src/servlet/S_StudentUploadFinishedProduct.java @@ -1,19 +1,17 @@ package servlet; import javax.servlet.ServletException; +import javax.servlet.annotation.MultipartConfig; 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(name = "S_StudentUploadFinishedProduct") +@WebServlet(name = "student-upload-finished-product") +@MultipartConfig public class S_StudentUploadFinishedProduct extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } } diff --git a/src/servlet/S_TeacherSelectStudent.java b/src/servlet/S_TeacherSelectStudent.java index fe20103..ab880eb 100644 --- a/src/servlet/S_TeacherSelectStudent.java +++ b/src/servlet/S_TeacherSelectStudent.java @@ -13,13 +13,13 @@ import java.io.IOException; public class S_TeacherSelectStudent extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); - String student_id=request.getParameter("id"); + String studentId=request.getParameter("id"); User user=(User)request.getSession().getAttribute("user"); - String teacher_id=user.getId(); + String teacherId=user.getId(); try { C_TeacherSelectStudent TSS=new C_TeacherSelectStudent(); - TSS.setTeacherId(teacher_id); - TSS.setStudentId(student_id); + TSS.setTeacherId(teacherId); + TSS.setStudentId(studentId); TSS.select(); } catch (Exception e) { e.printStackTrace(); diff --git a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java index ac47c5b..4e55b0a 100644 --- a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java +++ b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java @@ -6,14 +6,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; -@WebServlet(name = "S_TeacherTeamFillOpeningReportOpinion") +@WebServlet(name = "teacher-team-fill-opening-report-opinion") public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } -} + static String[] vName = { + "" + }; +} \ No newline at end of file diff --git a/src/servlet/S_TeacherTeamFillScoreOpinion.java b/src/servlet/S_TeacherTeamFillScoreOpinion.java index e3418ef..a72ac08 100644 --- a/src/servlet/S_TeacherTeamFillScoreOpinion.java +++ b/src/servlet/S_TeacherTeamFillScoreOpinion.java @@ -6,14 +6,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; -@WebServlet(name = "S_TeacherFillTeamFillScoreOpinion") -public class S_TeacherFillTeamFillScoreOpinion extends HttpServlet { +@WebServlet(name = "S_TeacherTeamFillScoreOpinion") +public class S_TeacherTeamFillScoreOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String id = request.getParameter("id"); + Map vMap = servlet.Utils.getVMap(vName,request); } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - } + static String[] vName = { + "" + }; } diff --git a/src/servlet/Utils.java b/src/servlet/Utils.java index 06037af..7176796 100644 --- a/src/servlet/Utils.java +++ b/src/servlet/Utils.java @@ -1,4 +1,18 @@ package servlet; +import org.apache.coyote.Request; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public interface Utils { + static Map getVMap(String[] vName, HttpServletRequest request){ + Map vMap = new HashMap<>(); + for(int i=0;i Date: Mon, 14 Jan 2019 23:35:36 +0800 Subject: [PATCH 27/34] Merge remote-tracking branch 'remotes/origin/wmj' into wlf # Conflicts: # src/core/process/C_StudentUploadOpeningReport.java --- src/core/process/C_MentorFillReview.java | 58 ++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 src/core/process/C_MentorFillReview.java diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java new file mode 100644 index 0000000..d9a3128 --- /dev/null +++ b/src/core/process/C_MentorFillReview.java @@ -0,0 +1,58 @@ +package core.process; + +import core.operation.FillInformation; +import error.GExcptInit; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_MentorFillReview extends TempProcess { + public String teacherID; + public String teacher_opinion; + public Map vMap; + + static String table="graduation_design_finished_product_mentor_score"; + public String getTeacher_opinion() { + return teacher_opinion; + } + public void setTeacher_opinion(String teacher_opinion) { + this.teacher_opinion = teacher_opinion; + } + public String getTeacherID() { + return teacherID; + } + public void setTeacherID(String teacherID) { + this.teacherID = teacherID; + } + public Map getvMap() { + return vMap; + } + public void setvMap(Map vMap) { + this.vMap = vMap; + } + public void TeacherTeamFillOpeningReportOpinion() throws Exception{ + if(!check()) throw new GExcptInit("MentorFillReview Attrs init error!"); + FillInformation fillInformation=new FillInformation(); + fillInformation.setOptions(new HashMap<>()); + fillInformation.addOptions("table",table); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"); + String date=df.format(new Date()); + vMap.put("review_opinion_date",date); + Maplimits = new HashMap<>(); + limits.put("id",this.getTeacherID()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + } + + + @Override + protected boolean check() { + if(this.getTeacherID().equals(null)||this.getTeacher_opinion().equals(null)||this.getvMap().equals(null)) + return false; + else + return true; + } +} + From 8a5678029cc36116efdafbf8005da60eb866a7a4 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Mon, 14 Jan 2019 23:47:22 +0800 Subject: [PATCH 28/34] =?UTF-8?q?S=5FServlet=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/operation/UploadFile.java | 8 +--- src/core/operation/UploadFile.json | 2 +- src/core/operation/utils/Utils.java | 15 ------- ...tudentFillGraduationDesignInformation.java | 2 - .../S_StudentUploadFinishedProduct.java | 6 ++- src/servlet/S_StudentUploadOpeningReport.java | 26 ++---------- src/servlet/Utils.java | 42 +++++++++++++++++++ 7 files changed, 51 insertions(+), 50 deletions(-) diff --git a/src/core/operation/UploadFile.java b/src/core/operation/UploadFile.java index b75dcfa..75c76cb 100644 --- a/src/core/operation/UploadFile.java +++ b/src/core/operation/UploadFile.java @@ -14,18 +14,12 @@ import java.util.Map; public class UploadFile extends Operation { @Override public Map execute(User subject) throws Exception { - File file = (File) this.getOptions().get("file"); String table = (String) this.getOptions().get("file_type"); Map limits = (Map) this.getOptions().get("limits"); - String field = core.operation.utils.Utils.getFileField(table); - String filePath = core.operation.utils.Utils.getFilePathName(table,file.getName()); + String filePath = (String) this.getOptions().get("file_url"); Map vMap = new HashMap<>(); vMap.put(field,filePath); - - file.renameTo(new File(filePath)); - //todo - List ls = new ArrayList<>(); ls.add(field); List resultLs = DBManagement.select(ls,table,limits,0,1); diff --git a/src/core/operation/UploadFile.json b/src/core/operation/UploadFile.json index c2a2f65..0181176 100644 --- a/src/core/operation/UploadFile.json +++ b/src/core/operation/UploadFile.json @@ -1,6 +1,6 @@ { "options":{ - "file": "File", + "file_url": "String", "file_type": "String", "limits":"Map" }, diff --git a/src/core/operation/utils/Utils.java b/src/core/operation/utils/Utils.java index 217e8be..6b09955 100644 --- a/src/core/operation/utils/Utils.java +++ b/src/core/operation/utils/Utils.java @@ -35,19 +35,4 @@ public interface Utils { static String getFileField(String table){ return fileTableField.get(table); } - static String getFilePath(String table){ - return Configuration.filePath+table+"/"; - } - static String getFileName(String fileName){ - SimpleDateFormat simpleDateFormat; - simpleDateFormat = new SimpleDateFormat("yyMMddHHmmssSSS"); - Date date = new Date(); - String str = simpleDateFormat.format(date); - str+=(int)(Math.random()*100000); - str+= utils.Utils.getFileType(fileName); - return str; - } - static String getFilePathName(String table, String fileName){ - return getFilePath(table)+getFileName(fileName); - } } diff --git a/src/servlet/S_StudentFillGraduationDesignInformation.java b/src/servlet/S_StudentFillGraduationDesignInformation.java index d91779c..9838562 100644 --- a/src/servlet/S_StudentFillGraduationDesignInformation.java +++ b/src/servlet/S_StudentFillGraduationDesignInformation.java @@ -1,7 +1,5 @@ package servlet; -import core.user.User; - import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java index 9eaec19..266671c 100644 --- a/src/servlet/S_StudentUploadFinishedProduct.java +++ b/src/servlet/S_StudentUploadFinishedProduct.java @@ -8,10 +8,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet(name = "student-upload-finished-product") +@WebServlet("/student-upload-finished-product") @MultipartConfig public class S_StudentUploadFinishedProduct extends HttpServlet { + static String fileType = "graduation_design_finished_product"; protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - + String id = request.getParameter("id"); + String fileURL = servlet.Utils.saveFile(request, fileType); } } diff --git a/src/servlet/S_StudentUploadOpeningReport.java b/src/servlet/S_StudentUploadOpeningReport.java index df0f052..4102e91 100644 --- a/src/servlet/S_StudentUploadOpeningReport.java +++ b/src/servlet/S_StudentUploadOpeningReport.java @@ -14,30 +14,10 @@ import java.util.UUID; @WebServlet("/student-upload-opening-report") @MultipartConfig -//学生id+文件 public class S_StudentUploadOpeningReport extends HttpServlet { - private static final long serialVersionUID = 1L; + static String fileType = "graduation_design_opening_report"; protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doPost(request, response); - User user=(User) request.getSession().getAttribute("user"); - String student_id=user.getId(); - - try { - - //获取上传的文件 - Part part=request.getPart("file"); - //获取请求的信息 - String name=part.getHeader("content-disposition"); - //获取上传文件的目录 - String root=request.getServletContext().getRealPath("/upload"); - - - request.setAttribute("info", "上传文件成功"); - } catch (Exception e) { - e.printStackTrace(); - request.setAttribute("info", "上传文件失败"); - } - - request.getRequestDispatcher("/upload.jsp").forward(request, response); + String id = request.getParameter("id"); + String fileURL = servlet.Utils.saveFile(request, fileType); } } diff --git a/src/servlet/Utils.java b/src/servlet/Utils.java index 7176796..687b7e9 100644 --- a/src/servlet/Utils.java +++ b/src/servlet/Utils.java @@ -1,8 +1,17 @@ package servlet; +import gdms.Configuration; import org.apache.coyote.Request; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.Part; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -15,4 +24,37 @@ public interface Utils { } return vMap; } + static String getFilePath(String table){ + return Configuration.filePath+table+"/"; + } + static String getFileName(String fileName){ + SimpleDateFormat simpleDateFormat; + simpleDateFormat = new SimpleDateFormat("yyMMddHHmmssSSS"); + Date date = new Date(); + String str = simpleDateFormat.format(date); + str+=(int)(Math.random()*100000); + str+= utils.Utils.getFileType(fileName); + return str; + } + static String getFilePathName(String table, String fileName){ + return getFilePath(table)+getFileName(fileName); + } + static String saveFile(HttpServletRequest request, String table) throws IOException, ServletException { + Part part = request.getPart("graduation_design"); + String header = part.getHeader("content-disposition"); + String path = header.substring(header.indexOf("filename=") + 10, header.length() - 1); + String filePathName = servlet.Utils.getFilePathName(table,path); + File file = new File(filePathName); + InputStream inputStream = part.getInputStream(); + FileOutputStream outputStream = new FileOutputStream(file); + int len; + byte[] bytes = new byte[1024]; + while ((len = inputStream.read(bytes)) != -1) { + outputStream.write(bytes, 0, len); + } + outputStream.close(); + inputStream.close(); + part.delete(); + return filePathName; + } } From ad2cb3d81fa36fe9ed9fd86ba3dcc3dedc368cab Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Mon, 14 Jan 2019 23:55:00 +0800 Subject: [PATCH 29/34] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Process?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../C_CollegeFillOpeningReportOpinion.java | 54 ++++++++++++++++++- .../process/C_CollegeFillScoreOpinion.java | 37 +++++++++++++ .../C_MentorFillOpeningReportOpinion.java | 19 +++---- .../process/C_SchoolFillScoreOpinion.java | 53 ++++++++++++++++++ .../C_SecretaryFillOpeningReportOpinion.java | 50 +++++++++++++++++ .../process/C_SecretaryFillReplyRecord.java | 51 ++++++++++++++++++ ...tudentFillGraduationDesignInformation.java | 47 ++++++++++++++++ .../C_StudentUploadFinishedProduct.java | 48 +++++++++++++++++ ...C_TeacherTeamFillOpeningReportOpinion.java | 50 +++++++++++++++++ .../C_TeacherTeamFillScoreOpinion.java | 49 +++++++++++++++++ 10 files changed, 445 insertions(+), 13 deletions(-) create mode 100644 src/core/process/C_CollegeFillScoreOpinion.java create mode 100644 src/core/process/C_SchoolFillScoreOpinion.java create mode 100644 src/core/process/C_SecretaryFillOpeningReportOpinion.java create mode 100644 src/core/process/C_SecretaryFillReplyRecord.java create mode 100644 src/core/process/C_StudentFillGraduationDesignInformation.java create mode 100644 src/core/process/C_StudentUploadFinishedProduct.java create mode 100644 src/core/process/C_TeacherTeamFillOpeningReportOpinion.java create mode 100644 src/core/process/C_TeacherTeamFillScoreOpinion.java diff --git a/src/core/process/C_CollegeFillOpeningReportOpinion.java b/src/core/process/C_CollegeFillOpeningReportOpinion.java index 4e93675..ca233fe 100644 --- a/src/core/process/C_CollegeFillOpeningReportOpinion.java +++ b/src/core/process/C_CollegeFillOpeningReportOpinion.java @@ -1,4 +1,56 @@ package core.process; -public class C_CollegeFillOpeningReportOpinion { +import core.operation.FillInformation; +import error.GExcptInit; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_CollegeFillOpeningReportOpinion extends TempProcess{ + String graduationDesignId; + String opening_report_college_teacher_id; + Map vMap; + + 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); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"); + String date=df.format(new Date()); + vMap.put("college_opinion_date",date); + Maplimits = new HashMap<>(); + limits.put("id",this.getGraduationDesignId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + } + protected boolean check() { + if(this.getOpening_report_college_teacher_id()==null||this.getGraduationDesignId()==null) + return false; + return true; + } + public String getGraduationDesignId() { + return graduationDesignId; + } + + public void setGraduationDesignId(String graduationDesignId) { + this.graduationDesignId = graduationDesignId; + } + + public String getOpening_report_college_teacher_id() { + return opening_report_college_teacher_id; + } + + public void setOpening_report_college_teacher_id(String opening_report_college_teacher_id) { + this.opening_report_college_teacher_id = opening_report_college_teacher_id; + } + + public void setvMap(Map vMap) { + this.vMap = vMap; + } + } diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java new file mode 100644 index 0000000..a3fafe8 --- /dev/null +++ b/src/core/process/C_CollegeFillScoreOpinion.java @@ -0,0 +1,37 @@ +package core.process; + +import core.operation.FillInformation; +import error.GExcptInit; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_CollegeFillScoreOpinion extends TempProcess{ + + String graduationDesignId; + Map vMap; + + static String table="graduation_design_reply_opinion_record_score"; + + public void fillInformation() throws Exception{ + if(!check()) throw new GExcptInit("FillInformations Attrs Init error!"); + FillInformation fillInformation=new FillInformation(); + fillInformation.setOptions(new HashMap<>()); + fillInformation.addOptions("table",table); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"); + String date=df.format(new Date()); + vMap.put("secretary_record_date",date); + Maplimits = new HashMap<>(); + limits.put("id",this.getGraduationDesignId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + + } + protected boolean check() { + if(this.getGraduationDesignId()==null) + return false; + return true; + } +} diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index 1db9c1b..d88329c 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -3,6 +3,7 @@ package core.process; import core.operation.FillInformation; import error.GExcptInit; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -11,7 +12,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ String StudentId; String mentor_opinion; - Date mentor_opinion_date; + Map vMap; static String table="graduation_design_opening_report_opinion_record"; @@ -20,10 +21,9 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ FillInformation fillInformation=new FillInformation(); fillInformation.setOptions(new HashMap<>()); fillInformation.addOptions("table",table); - String date= mentor_opinion_date.toString(); - Map vMap=new HashMap<>(); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"); + String date=df.format(new Date()); 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); @@ -31,7 +31,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ } protected boolean check() { - if(this.getMentor_opinion()==null||this.getMentor_opinion_date()==null||this.getStudentId()==null) + if(this.getMentor_opinion()==null||this.getStudentId()==null) return false; return true; } @@ -50,12 +50,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ this.mentor_opinion = mentor_opinion; } - public Date getMentor_opinion_date() { - return mentor_opinion_date; + public void setvMap(Map vMap) { + this.vMap = vMap; } - - public void setMentor_opinion_date(Date mentor_opinion_date) { - this.mentor_opinion_date = mentor_opinion_date; - } - } diff --git a/src/core/process/C_SchoolFillScoreOpinion.java b/src/core/process/C_SchoolFillScoreOpinion.java new file mode 100644 index 0000000..b1ec92d --- /dev/null +++ b/src/core/process/C_SchoolFillScoreOpinion.java @@ -0,0 +1,53 @@ +package core.process; + +import core.operation.FillInformation; +import error.GExcptInit; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_SchoolFillScoreOpinion extends TempProcess { + + String graduationDesignId; + Map vMap; + + static String table="graduation_design_reply_opinion_record_score"; + 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); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"); + String date=df.format(new Date()); + vMap.put("school_opinion_date",date); + Maplimits = new HashMap<>(); + limits.put("id",this.getGraduationDesignId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + } + protected boolean check() { + if(this.getGraduationDesignId()==null) + return false; + return true; + } + @Override + public String getGraduationDesignId() { + return graduationDesignId; + } + + @Override + public void setGraduationDesignId(String graduationDesignId) { + this.graduationDesignId = graduationDesignId; + } + public void setvMap(Map vMap) { + this.vMap = vMap; + } + +} + + + + + diff --git a/src/core/process/C_SecretaryFillOpeningReportOpinion.java b/src/core/process/C_SecretaryFillOpeningReportOpinion.java new file mode 100644 index 0000000..f97258f --- /dev/null +++ b/src/core/process/C_SecretaryFillOpeningReportOpinion.java @@ -0,0 +1,50 @@ +package core.process; + +import core.operation.FillInformation; +import error.GExcptInit; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_SecretaryFillOpeningReportOpinion extends TempProcess{ + + String graduationDesignId; + Map vMap; + + 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); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"); + String date=df.format(new Date()); + vMap.put("secretary_record_date",date); + Maplimits = new HashMap<>(); + limits.put("id",this.getGraduationDesignId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + } + protected boolean check() { + if(this.getGraduationDesignId()==null) + return false; + return true; + } + @Override + public String getGraduationDesignId() { + return graduationDesignId; + } + + @Override + public void setGraduationDesignId(String graduationDesignId) { + this.graduationDesignId = graduationDesignId; + } + + public void setvMap(Map vMap) { + this.vMap = vMap; + } + +} diff --git a/src/core/process/C_SecretaryFillReplyRecord.java b/src/core/process/C_SecretaryFillReplyRecord.java new file mode 100644 index 0000000..172b0aa --- /dev/null +++ b/src/core/process/C_SecretaryFillReplyRecord.java @@ -0,0 +1,51 @@ +package core.process; + +import core.operation.FillInformation; +import error.GExcptInit; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_SecretaryFillReplyRecord extends TempProcess{ + + String graduationDesignId; + Map vMap; + + static String table="graduation_design_reply_opinion_record_score"; + + public void fillInformation() throws Exception{ + if(!check()) throw new GExcptInit("FillInformations Attrs Init error!"); + FillInformation fillInformation=new FillInformation(); + fillInformation.setOptions(new HashMap<>()); + fillInformation.addOptions("table",table); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"); + String date=df.format(new Date()); + vMap.put("secretary_record_date",date); + Maplimits = new HashMap<>(); + limits.put("id",this.getGraduationDesignId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + + } + protected boolean check() { + if(this.getGraduationDesignId()==null) + return false; + return true; + } + public String getGraduationDesignId() { + return graduationDesignId; + } + @Override + public void setGraduationDesignId(String graduationDesignId) { + this.graduationDesignId = graduationDesignId; + } + + public void setvMap(Map vMap) { + this.vMap = vMap; + } + + + +} diff --git a/src/core/process/C_StudentFillGraduationDesignInformation.java b/src/core/process/C_StudentFillGraduationDesignInformation.java new file mode 100644 index 0000000..5a7c5e5 --- /dev/null +++ b/src/core/process/C_StudentFillGraduationDesignInformation.java @@ -0,0 +1,47 @@ +package core.process; + +import core.operation.FillInformation; +import error.GExcptInit; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_StudentFillGraduationDesignInformation extends TempProcess{ + String graduationDesignId; + Map vMap; + + 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); + Maplimits = new HashMap<>(); + limits.put("id",this.getGraduationDesignId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + } + protected boolean check() { + if(this.getGraduationDesignId()==null) + return false; + return true; + } + @Override + public String getGraduationDesignId() { + return graduationDesignId; + } + + @Override + public void setGraduationDesignId(String graduationDesignId) { + this.graduationDesignId = graduationDesignId; + } + + public void setvMap(Map vMap) { + this.vMap = vMap; + } + + +} \ No newline at end of file diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java new file mode 100644 index 0000000..36068c5 --- /dev/null +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -0,0 +1,48 @@ +package core.process; + +import core.operation.UploadFile; +import error.GExcptInit; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +public class C_StudentUploadFinishedProduct { + + File finishedProduct; + String gaduationDesignId; + + static String file_type = "finished_product"; + public void uploadOpeningReport() throws Exception{ + if(!check()) throw new GExcptInit("Upload FinishedProduct Attrs init error!"); + UploadFile uploadFile=new UploadFile(); + uploadFile.setOptions(new HashMap<>()); + uploadFile.addOptions("file",this.getFinishedProduct()); + uploadFile.addOptions("file_type",file_type); + Maplimits = new HashMap<>(); + limits.put("id",this.getGaduationDesignId()); + uploadFile.addOptions("limits",limits); + uploadFile.execute(null); + } + + protected boolean check() { + if(this.getFinishedProduct()==null||this.getGaduationDesignId()==null) + return false; + return true; + } + public File getFinishedProduct() { + return finishedProduct; + } + + public void setFinishedProduct(File finishedProduct) { + this.finishedProduct = finishedProduct; + } + public String getGaduationDesignId() { + return gaduationDesignId; + } + + public void setGaduationDesignId(String gaduationDesignId) { + this.gaduationDesignId = gaduationDesignId; + } + +} diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java new file mode 100644 index 0000000..23d46fa --- /dev/null +++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java @@ -0,0 +1,50 @@ +package core.process; + +import core.operation.FillInformation; +import error.GExcptInit; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{ + + String graduationDesignId; + Map vMap; + + 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); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"); + String date=df.format(new Date()); + vMap.put("report_teacher_team_opinion_date",date); + Maplimits = new HashMap<>(); + limits.put("id",this.getGraduationDesignId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + } + protected boolean check() { + if(this.getGraduationDesignId()==null) + return false; + return true; + } + @Override + public String getGraduationDesignId() { + return graduationDesignId; + } + + @Override + public void setGraduationDesignId(String graduationDesignId) { + this.graduationDesignId = graduationDesignId; + } + + public void setvMap(Map vMap) { + this.vMap = vMap; + } + +} diff --git a/src/core/process/C_TeacherTeamFillScoreOpinion.java b/src/core/process/C_TeacherTeamFillScoreOpinion.java new file mode 100644 index 0000000..bb985cf --- /dev/null +++ b/src/core/process/C_TeacherTeamFillScoreOpinion.java @@ -0,0 +1,49 @@ +package core.process; + +import core.operation.FillInformation; +import error.GExcptInit; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_TeacherTeamFillScoreOpinion extends TempProcess { + + String graduationDesignId; + Map vMap; + + static String table="graduation_design_reply_opinion_record_score"; + + 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); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"); + String date=df.format(new Date()); + vMap.put("teacher_team_opinion_date",date); + Maplimits = new HashMap<>(); + limits.put("id",this.getGraduationDesignId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + } + protected boolean check() { + if(this.getGraduationDesignId()==null) + return false; + return true; + } + @Override + public String getGraduationDesignId() { + return graduationDesignId; + } + + @Override + public void setGraduationDesignId(String graduationDesignId) { + this.graduationDesignId = graduationDesignId; + } + public void setvMap(Map vMap) { + this.vMap = vMap; + } + +} From bdbdab5947541220d15dd425007185deb35f6a5d Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Tue, 15 Jan 2019 00:11:34 +0800 Subject: [PATCH 30/34] Merge remote-tracking branch 'origin/master' # Conflicts: # .idea/misc.xml # src/core/process/C_StudentUploadOpeningReport.java --- .idea/artifacts/GDMS_war_exploded.xml | 2 +- .idea/misc.xml | 2 +- GDMS.iml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml index 95189d4..1d55d9c 100644 --- a/.idea/artifacts/GDMS_war_exploded.xml +++ b/.idea/artifacts/GDMS_war_exploded.xml @@ -8,8 +8,8 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 9486b47..df60b67 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/GDMS.iml b/GDMS.iml index b6ef183..20dda90 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -19,8 +19,8 @@ - - - + + + \ No newline at end of file From 49e397a08a705ff47d6c5cd8bbbdd42a92f59c4b Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 00:14:20 +0800 Subject: [PATCH 31/34] =?UTF-8?q?S=5FServlet=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/servlet/S_CollegeFillOpeningReportOpinion.java | 4 ++-- src/servlet/S_CollegeFillScoreOpinion.java | 5 +++-- src/servlet/S_MentorFillOpeningReportOpinion.java | 4 ++-- src/servlet/S_MentorFillReview.java | 5 +++-- src/servlet/S_ReviewerFillReview.java | 5 +++-- src/servlet/S_SchoolFillScoreOpinion.java | 5 +++-- src/servlet/S_SecretaryFillOpeningReportRecord.java | 4 ++-- src/servlet/S_SecretaryFillReplyRecord.java | 4 ++-- src/servlet/S_TeacherTeamFillOpeningReportOpinion.java | 4 ++-- src/servlet/S_TeacherTeamFillScoreOpinion.java | 5 +++-- 10 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/servlet/S_CollegeFillOpeningReportOpinion.java b/src/servlet/S_CollegeFillOpeningReportOpinion.java index 6162fa5..e15b6ba 100644 --- a/src/servlet/S_CollegeFillOpeningReportOpinion.java +++ b/src/servlet/S_CollegeFillOpeningReportOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_CollegeFillOpeningReportOpinion") +@WebServlet("college-fill-opening-report-opinion") public class S_CollegeFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); @@ -16,6 +16,6 @@ public class S_CollegeFillOpeningReportOpinion extends HttpServlet { } static String[] vName = { - "" + "college_opinion" }; } \ No newline at end of file diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java index 0d25745..7b0bdee 100644 --- a/src/servlet/S_CollegeFillScoreOpinion.java +++ b/src/servlet/S_CollegeFillScoreOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_CollegeFillScoreOpinion") +@WebServlet("college-fill-score-opinion") public class S_CollegeFillScoreOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); @@ -16,6 +16,7 @@ public class S_CollegeFillScoreOpinion extends HttpServlet { } static String[] vName = { - "" + "college_opinion", + "college_score" }; } \ No newline at end of file diff --git a/src/servlet/S_MentorFillOpeningReportOpinion.java b/src/servlet/S_MentorFillOpeningReportOpinion.java index 625520f..299165d 100644 --- a/src/servlet/S_MentorFillOpeningReportOpinion.java +++ b/src/servlet/S_MentorFillOpeningReportOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_MentorFillOpeningReportOpinion") +@WebServlet("mentor-fill-opening-report-opinion") public class S_MentorFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); @@ -16,6 +16,6 @@ public class S_MentorFillOpeningReportOpinion extends HttpServlet { } static String[] vName = { - "" + "mentor_opinion" }; } \ No newline at end of file diff --git a/src/servlet/S_MentorFillReview.java b/src/servlet/S_MentorFillReview.java index f28b2d1..1ece272 100644 --- a/src/servlet/S_MentorFillReview.java +++ b/src/servlet/S_MentorFillReview.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_MentorFillReview") +@WebServlet("mentor-fill-review") public class S_MentorFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); @@ -16,6 +16,7 @@ public class S_MentorFillReview extends HttpServlet { } static String[] vName = { - "" + "total_grade", + "review_opinion" }; } \ No newline at end of file diff --git a/src/servlet/S_ReviewerFillReview.java b/src/servlet/S_ReviewerFillReview.java index a23d80a..f950771 100644 --- a/src/servlet/S_ReviewerFillReview.java +++ b/src/servlet/S_ReviewerFillReview.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_ReviewerFillReview") +@WebServlet("reviewer-fill-review") public class S_ReviewerFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); @@ -16,6 +16,7 @@ public class S_ReviewerFillReview extends HttpServlet { } static String[] vName = { - "" + "score", + "opinion" }; } \ No newline at end of file diff --git a/src/servlet/S_SchoolFillScoreOpinion.java b/src/servlet/S_SchoolFillScoreOpinion.java index 97d7cd5..d6b0e9d 100644 --- a/src/servlet/S_SchoolFillScoreOpinion.java +++ b/src/servlet/S_SchoolFillScoreOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_SchoolFillScoreOpinion") +@WebServlet("school-fill-score-opinion") public class S_SchoolFillScoreOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); @@ -16,6 +16,7 @@ public class S_SchoolFillScoreOpinion extends HttpServlet { } static String[] vName = { - "" + "school_opinion", + "school_score" }; } \ No newline at end of file diff --git a/src/servlet/S_SecretaryFillOpeningReportRecord.java b/src/servlet/S_SecretaryFillOpeningReportRecord.java index 0fc9fb5..2ef4f62 100644 --- a/src/servlet/S_SecretaryFillOpeningReportRecord.java +++ b/src/servlet/S_SecretaryFillOpeningReportRecord.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_SecretaryFillOpeningReportRecord") +@WebServlet("secretary-fill-opening-report-record") public class S_SecretaryFillOpeningReportRecord extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); @@ -16,6 +16,6 @@ public class S_SecretaryFillOpeningReportRecord extends HttpServlet { } static String[] vName = { - "" + "secretary_record" }; } \ No newline at end of file diff --git a/src/servlet/S_SecretaryFillReplyRecord.java b/src/servlet/S_SecretaryFillReplyRecord.java index 7b20ab4..90a10fa 100644 --- a/src/servlet/S_SecretaryFillReplyRecord.java +++ b/src/servlet/S_SecretaryFillReplyRecord.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "secretary-fill-reply-record") +@WebServlet("secretary-fill-reply-record") public class S_SecretaryFillReplyRecord extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); @@ -16,6 +16,6 @@ public class S_SecretaryFillReplyRecord extends HttpServlet { } static String[] vName = { - "" + "secretary_record" }; } diff --git a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java index 4e55b0a..c43e7fd 100644 --- a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java +++ b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "teacher-team-fill-opening-report-opinion") +@WebServlet("teacher-team-fill-opening-report-opinion") public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); @@ -16,6 +16,6 @@ public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet { } static String[] vName = { - "" + "report_teacher_team_opinion" }; } \ No newline at end of file diff --git a/src/servlet/S_TeacherTeamFillScoreOpinion.java b/src/servlet/S_TeacherTeamFillScoreOpinion.java index a72ac08..a82b234 100644 --- a/src/servlet/S_TeacherTeamFillScoreOpinion.java +++ b/src/servlet/S_TeacherTeamFillScoreOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_TeacherTeamFillScoreOpinion") +@WebServlet("teacher-team-fill-score-opinion") public class S_TeacherTeamFillScoreOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); @@ -16,6 +16,7 @@ public class S_TeacherTeamFillScoreOpinion extends HttpServlet { } static String[] vName = { - "" + "teacher_team_opinion", + "teacher_team_score" }; } From a02f896fc470c774778a6ebfdde218db832fbde2 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 09:06:29 +0800 Subject: [PATCH 32/34] =?UTF-8?q?=E6=A3=80=E6=9F=A5C=5FProcess?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../C_CollegeFillOpeningReportOpinion.java | 16 +++++----------- src/core/process/C_CollegeFillScoreOpinion.java | 4 ++-- .../C_MentorFillOpeningReportOpinion.java | 2 +- src/core/process/C_SchoolFillScoreOpinion.java | 2 +- .../C_SecretaryFillOpeningReportOpinion.java | 2 +- src/core/process/C_SecretaryFillReplyRecord.java | 4 ++-- ...C_StudentFillGraduationDesignInformation.java | 2 +- .../process/C_StudentUploadFinishedProduct.java | 14 +++++++------- .../process/C_StudentUploadOpeningReport.java | 14 +++++++------- .../C_TeacherTeamFillOpeningReportOpinion.java | 2 +- .../process/C_TeacherTeamFillScoreOpinion.java | 2 +- .../S_CollegeFillOpeningReportOpinion.java | 12 +++++++++++- src/servlet/S_CollegeFillScoreOpinion.java | 3 +++ 13 files changed, 43 insertions(+), 36 deletions(-) diff --git a/src/core/process/C_CollegeFillOpeningReportOpinion.java b/src/core/process/C_CollegeFillOpeningReportOpinion.java index ca233fe..27cae0f 100644 --- a/src/core/process/C_CollegeFillOpeningReportOpinion.java +++ b/src/core/process/C_CollegeFillOpeningReportOpinion.java @@ -10,7 +10,6 @@ import java.util.Map; public class C_CollegeFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; - String opening_report_college_teacher_id; Map vMap; static String table="graduation_design_opening_report_opinion_record"; @@ -29,7 +28,7 @@ public class C_CollegeFillOpeningReportOpinion extends TempProcess{ fillInformation.execute(null); } protected boolean check() { - if(this.getOpening_report_college_teacher_id()==null||this.getGraduationDesignId()==null) + if(this.getGraduationDesignId()==null||this.getVMap()==null) return false; return true; } @@ -41,16 +40,11 @@ public class C_CollegeFillOpeningReportOpinion extends TempProcess{ this.graduationDesignId = graduationDesignId; } - public String getOpening_report_college_teacher_id() { - return opening_report_college_teacher_id; - } - - public void setOpening_report_college_teacher_id(String opening_report_college_teacher_id) { - this.opening_report_college_teacher_id = opening_report_college_teacher_id; - } - - public void setvMap(Map vMap) { + public void setVMap(Map vMap) { this.vMap = vMap; } + public Map getVMap() { + return vMap; + } } diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java index a3fafe8..97b1fbd 100644 --- a/src/core/process/C_CollegeFillScoreOpinion.java +++ b/src/core/process/C_CollegeFillScoreOpinion.java @@ -16,13 +16,13 @@ public class C_CollegeFillScoreOpinion extends TempProcess{ static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ - if(!check()) throw new GExcptInit("FillInformations Attrs Init error!"); + if(!check()) throw new GExcptInit("FillInformation Attrs Init error!"); FillInformation fillInformation=new FillInformation(); fillInformation.setOptions(new HashMap<>()); fillInformation.addOptions("table",table); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss"); String date=df.format(new Date()); - vMap.put("secretary_record_date",date); + vMap.put("college_opinion_date",date); Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index 4c307f5..99bc66d 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -50,7 +50,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ this.mentor_opinion = mentor_opinion; } - public void setvMap(Map vMap) { + public void setVMap(Map vMap) { this.vMap = vMap; } } diff --git a/src/core/process/C_SchoolFillScoreOpinion.java b/src/core/process/C_SchoolFillScoreOpinion.java index b1ec92d..652cf1b 100644 --- a/src/core/process/C_SchoolFillScoreOpinion.java +++ b/src/core/process/C_SchoolFillScoreOpinion.java @@ -41,7 +41,7 @@ public class C_SchoolFillScoreOpinion extends TempProcess { public void setGraduationDesignId(String graduationDesignId) { this.graduationDesignId = graduationDesignId; } - public void setvMap(Map vMap) { + public void setVMap(Map vMap) { this.vMap = vMap; } diff --git a/src/core/process/C_SecretaryFillOpeningReportOpinion.java b/src/core/process/C_SecretaryFillOpeningReportOpinion.java index f97258f..d0398a3 100644 --- a/src/core/process/C_SecretaryFillOpeningReportOpinion.java +++ b/src/core/process/C_SecretaryFillOpeningReportOpinion.java @@ -43,7 +43,7 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{ this.graduationDesignId = graduationDesignId; } - public void setvMap(Map vMap) { + public void setVMap(Map vMap) { this.vMap = vMap; } diff --git a/src/core/process/C_SecretaryFillReplyRecord.java b/src/core/process/C_SecretaryFillReplyRecord.java index 172b0aa..0c8c478 100644 --- a/src/core/process/C_SecretaryFillReplyRecord.java +++ b/src/core/process/C_SecretaryFillReplyRecord.java @@ -16,7 +16,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{ static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ - if(!check()) throw new GExcptInit("FillInformations Attrs Init error!"); + if(!check()) throw new GExcptInit("FillInformation Attrs Init error!"); FillInformation fillInformation=new FillInformation(); fillInformation.setOptions(new HashMap<>()); fillInformation.addOptions("table",table); @@ -42,7 +42,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{ this.graduationDesignId = graduationDesignId; } - public void setvMap(Map vMap) { + public void setVMap(Map vMap) { this.vMap = vMap; } diff --git a/src/core/process/C_StudentFillGraduationDesignInformation.java b/src/core/process/C_StudentFillGraduationDesignInformation.java index 5a7c5e5..33e6df4 100644 --- a/src/core/process/C_StudentFillGraduationDesignInformation.java +++ b/src/core/process/C_StudentFillGraduationDesignInformation.java @@ -39,7 +39,7 @@ public class C_StudentFillGraduationDesignInformation extends TempProcess{ this.graduationDesignId = graduationDesignId; } - public void setvMap(Map vMap) { + public void setVMap(Map vMap) { this.vMap = vMap; } diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java index 36068c5..efd36a8 100644 --- a/src/core/process/C_StudentUploadFinishedProduct.java +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -10,7 +10,7 @@ import java.util.Map; public class C_StudentUploadFinishedProduct { File finishedProduct; - String gaduationDesignId; + String graduationDesignId; static String file_type = "finished_product"; public void uploadOpeningReport() throws Exception{ @@ -20,13 +20,13 @@ public class C_StudentUploadFinishedProduct { uploadFile.addOptions("file",this.getFinishedProduct()); uploadFile.addOptions("file_type",file_type); Maplimits = new HashMap<>(); - limits.put("id",this.getGaduationDesignId()); + limits.put("id",this.getGraduationDesignId()); uploadFile.addOptions("limits",limits); uploadFile.execute(null); } protected boolean check() { - if(this.getFinishedProduct()==null||this.getGaduationDesignId()==null) + if(this.getFinishedProduct()==null||this.getGraduationDesignId()==null) return false; return true; } @@ -37,12 +37,12 @@ public class C_StudentUploadFinishedProduct { public void setFinishedProduct(File finishedProduct) { this.finishedProduct = finishedProduct; } - public String getGaduationDesignId() { - return gaduationDesignId; + public String getGraduationDesignId() { + return graduationDesignId; } - public void setGaduationDesignId(String gaduationDesignId) { - this.gaduationDesignId = gaduationDesignId; + public void setGraduationDesignId(String graduationDesignId) { + this.graduationDesignId = graduationDesignId; } } diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java index c2bb813..69c70b3 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -9,7 +9,7 @@ import java.util.Map; public class C_StudentUploadOpeningReport extends TempProcess{ File openingReport; - String gaduationDesignId; + String graduationDesignId; static String file_type = "opening_report"; @@ -20,13 +20,13 @@ public class C_StudentUploadOpeningReport extends TempProcess{ uploadFileOperation.addOptions("file",this.getOpeningReport()); uploadFileOperation.addOptions("file_type",file_type); Maplimits = new HashMap<>(); - limits.put("id",this.getGaduationDesignId()); + limits.put("id",this.getGraduationDesignId()); uploadFileOperation.addOptions("limits",limits); uploadFileOperation.execute(null); } protected boolean check() { - if(this.getGaduationDesignId()==null||this.getOpeningReport()==null) + if(this.getGraduationDesignId()==null||this.getOpeningReport()==null) return false; return true; } @@ -39,11 +39,11 @@ public class C_StudentUploadOpeningReport extends TempProcess{ this.openingReport = openingReport; } - public String getGaduationDesignId() { - return gaduationDesignId; + public String getGraduationDesignId() { + return graduationDesignId; } - public void setGaduationDesignId(String gaduationDesignId) { - this.gaduationDesignId = gaduationDesignId; + public void setGraduationDesignId(String graduationDesignId) { + this.graduationDesignId = graduationDesignId; } } diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java index 23d46fa..cc0bf06 100644 --- a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java +++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java @@ -43,7 +43,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{ this.graduationDesignId = graduationDesignId; } - public void setvMap(Map vMap) { + public void setVMap(Map vMap) { this.vMap = vMap; } diff --git a/src/core/process/C_TeacherTeamFillScoreOpinion.java b/src/core/process/C_TeacherTeamFillScoreOpinion.java index bb985cf..e87c937 100644 --- a/src/core/process/C_TeacherTeamFillScoreOpinion.java +++ b/src/core/process/C_TeacherTeamFillScoreOpinion.java @@ -42,7 +42,7 @@ public class C_TeacherTeamFillScoreOpinion extends TempProcess { public void setGraduationDesignId(String graduationDesignId) { this.graduationDesignId = graduationDesignId; } - public void setvMap(Map vMap) { + public void setVMap(Map vMap) { this.vMap = vMap; } diff --git a/src/servlet/S_CollegeFillOpeningReportOpinion.java b/src/servlet/S_CollegeFillOpeningReportOpinion.java index e15b6ba..f84de95 100644 --- a/src/servlet/S_CollegeFillOpeningReportOpinion.java +++ b/src/servlet/S_CollegeFillOpeningReportOpinion.java @@ -1,5 +1,7 @@ package servlet; +import core.process.C_CollegeFillOpeningReportOpinion; + import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -13,7 +15,15 @@ public class S_CollegeFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); Map vMap = servlet.Utils.getVMap(vName,request); - + C_CollegeFillOpeningReportOpinion p =new C_CollegeFillOpeningReportOpinion(); + p.setGraduationDesignId(id); + p.setVMap(vMap); + try { + p.fillInformation(); + } catch (Exception e) { + e.printStackTrace(); + response.sendRedirect("/op_fail.jsp"); + } } static String[] vName = { "college_opinion" diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java index 7b0bdee..f9d9640 100644 --- a/src/servlet/S_CollegeFillScoreOpinion.java +++ b/src/servlet/S_CollegeFillScoreOpinion.java @@ -1,5 +1,7 @@ package servlet; +import core.process.C_CollegeFillScoreOpinion; + import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -13,6 +15,7 @@ public class S_CollegeFillScoreOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); Map vMap = servlet.Utils.getVMap(vName,request); + C_CollegeFillScoreOpinion p =new C_CollegeFillScoreOpinion(); } static String[] vName = { From c63578ca78ed2d7a8b2d6aa1ae6159b0ba54e5ff Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 09:38:20 +0800 Subject: [PATCH 33/34] =?UTF-8?q?=E6=A3=80=E6=9F=A5C=5FProcess?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml | 993 +++++++++--------- .idea/misc.xml | 2 +- .../process/C_CollegeFillScoreOpinion.java | 8 + .../C_MentorFillOpeningReportOpinion.java | 25 +- src/servlet/S_CollegeFillScoreOpinion.java | 9 +- .../S_MentorFillOpeningReportOpinion.java | 12 +- 6 files changed, 532 insertions(+), 517 deletions(-) diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml index dc24536..fbbe276 100644 --- a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml @@ -2,7 +2,7 @@ - 10.2.18 + 10.3.10 MariaDB InnoDB lower/lower @@ -22,2137 +22,2140 @@ 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 char(20)|0s normal - + 3 float|0s normal - + 4 text|0s normal - + 5 date|0s normal - + 6 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 - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 text|0s normal - + 4 date|0s normal - + 5 text|0s normal - + 6 date|0s normal - + 7 text|0s normal - + 8 date|0s normal - + 9 text|0s normal - + 10 date|0s normal - + 11 char(1)|0s normal - + 12 char(1)|0s normal - + 13 char(1)|0s normal - + 14 char(1)|0s normal - + 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 char(20)|0s normal - + 3 char(20)|0s normal - + 4 text|0s normal - + 5 date|0s normal - + 6 text|0s normal - + 7 date|0s normal - + 8 text|0s normal - + 9 float|0s normal - + 10 date|0s normal - + 11 text|0s normal - + 12 float|0s normal - + 13 date|0s normal - + 14 text|0s normal - + 15 float|0s normal - + 16 date|0s normal - + 17 char(1)|0s normal - + 18 char(1)|0s normal - + 19 char(1)|0s normal - + 20 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/misc.xml b/.idea/misc.xml index df60b67..9486b47 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java index 97b1fbd..96e4e7d 100644 --- a/src/core/process/C_CollegeFillScoreOpinion.java +++ b/src/core/process/C_CollegeFillScoreOpinion.java @@ -34,4 +34,12 @@ public class C_CollegeFillScoreOpinion extends TempProcess{ return false; return true; } + + public Map getVMap() { + return vMap; + } + + public void setVMap(Map vMap) { + this.vMap = vMap; + } } diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index 99bc66d..139904e 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -10,8 +10,6 @@ import java.util.Map; public class C_MentorFillOpeningReportOpinion extends TempProcess{ - String studentId; - String mentor_opinion; Map vMap; static String table="graduation_design_opening_report_opinion_record"; @@ -25,32 +23,21 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ String date=df.format(new Date()); vMap.put("mentor_opinion_date",date); Maplimits = new HashMap<>(); - limits.put("id",this.getStudentId()); + limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); fillInformation.execute(null); } protected boolean check() { - if(this.getMentor_opinion()==null||this.getStudentId()==null) + if(this.getVMap()==null||this.getGraduationDesignId()==null) return false; return true; } - public String getStudentId() { - return studentId; - } - - public void setStudentId(String studentId) { - this.studentId = studentId; - } - public String getMentor_opinion() { - return mentor_opinion; - } - - public void setMentor_opinion(String mentor_opinion) { - this.mentor_opinion = mentor_opinion; - } - public void setVMap(Map vMap) { this.vMap = vMap; } + + public Map getVMap() { + return vMap; + } } diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java index f9d9640..b66ec58 100644 --- a/src/servlet/S_CollegeFillScoreOpinion.java +++ b/src/servlet/S_CollegeFillScoreOpinion.java @@ -16,7 +16,14 @@ public class S_CollegeFillScoreOpinion extends HttpServlet { String id = request.getParameter("id"); Map vMap = servlet.Utils.getVMap(vName,request); C_CollegeFillScoreOpinion p =new C_CollegeFillScoreOpinion(); - + p.setGraduationDesignId(id); + p.setVMap(vMap); + try { + p.fillInformation(); + } catch (Exception e) { + e.printStackTrace(); + response.sendRedirect("/op_fail.jsp"); + } } static String[] vName = { "college_opinion", diff --git a/src/servlet/S_MentorFillOpeningReportOpinion.java b/src/servlet/S_MentorFillOpeningReportOpinion.java index 299165d..588215b 100644 --- a/src/servlet/S_MentorFillOpeningReportOpinion.java +++ b/src/servlet/S_MentorFillOpeningReportOpinion.java @@ -1,5 +1,7 @@ package servlet; +import core.process.C_MentorFillOpeningReportOpinion; + import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -13,7 +15,15 @@ public class S_MentorFillOpeningReportOpinion extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); Map vMap = servlet.Utils.getVMap(vName,request); - + C_MentorFillOpeningReportOpinion p = new C_MentorFillOpeningReportOpinion(); + p.setGraduationDesignId(id); + p.setVMap(vMap); + try { + p.fillInformation(); + } catch (Exception e) { + e.printStackTrace(); + response.sendRedirect("/op_fail.jsp"); + } } static String[] vName = { "mentor_opinion" From a4e4c862e029498f6d89c929fd07cdcffe206d38 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 09:57:05 +0800 Subject: [PATCH 34/34] =?UTF-8?q?=E6=A3=80=E6=9F=A5C=5FProcess?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- GDMS.iml | 16 ++++++++++++---- src/gdms/test.java | 12 ------------ src/servlet/S_StudentUploadFinishedProduct.java | 3 ++- src/servlet/Utils.java | 1 - web/jsFile/upload_action.js | 4 ++-- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 9486b47..11bca97 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/GDMS.iml b/GDMS.iml index 20dda90..23fde1f 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -17,10 +17,18 @@ - + - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/gdms/test.java b/src/gdms/test.java index ffdddc1..55dbfa0 100644 --- a/src/gdms/test.java +++ b/src/gdms/test.java @@ -17,18 +17,6 @@ public class test { System.out.println(i); }while(i<3); - List list = new ArrayList<>(); - list.add("q"); - list.add("w"); - Map map=new HashMap<>(); - map.put("a","b"); - map.put("c","d"); - Select sql = new Select(list,"zx",map,1,2); - System.out.println(sql.getSQL()); - System.out.println(Utils.getFilePathName("a","b")); - String a = "a"; - changeB(a); - System.out.println(a); } static void changeB(String a){ a="B"; diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java index 266671c..20f2fb5 100644 --- a/src/servlet/S_StudentUploadFinishedProduct.java +++ b/src/servlet/S_StudentUploadFinishedProduct.java @@ -13,7 +13,8 @@ import java.io.IOException; public class S_StudentUploadFinishedProduct extends HttpServlet { static String fileType = "graduation_design_finished_product"; protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String id = request.getParameter("id"); + String id = "000"; + //String id = request.getParameter("id"); String fileURL = servlet.Utils.saveFile(request, fileType); } } diff --git a/src/servlet/Utils.java b/src/servlet/Utils.java index 687b7e9..3cea1d0 100644 --- a/src/servlet/Utils.java +++ b/src/servlet/Utils.java @@ -1,7 +1,6 @@ package servlet; import gdms.Configuration; -import org.apache.coyote.Request; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js index c3214c9..c756a06 100644 --- a/web/jsFile/upload_action.js +++ b/web/jsFile/upload_action.js @@ -4,8 +4,8 @@ $(document).ready(function () { $(document).off('change',showMsg).on('change','.true-select',showMsg) }) function sendFile() { - var fileData =new FormData; - var Url4='testfrom.jsp'; + var fileData =new FormData(); + var Url4='student-upload-finished-product'; var file=$('.true-select').files; if($('.true-select').val()=='') {