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 1/4] 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 2/4] 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 159041f5eee2110f62015f28b1c498d0f9814e13 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Mon, 14 Jan 2019 16:25:34 +0800 Subject: [PATCH 3/4] 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 06841d30db097e70e9b5b90cea20415b648e6f8b Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Mon, 14 Jan 2019 16:58:02 +0800 Subject: [PATCH 4/4] 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 { -}