diff --git a/.idea/artifacts/gdms_Web_exploded.xml b/.idea/artifacts/gdms_Web_exploded.xml new file mode 100644 index 0000000..00e9edf --- /dev/null +++ b/.idea/artifacts/gdms_Web_exploded.xml @@ -0,0 +1,16 @@ + + + $PROJECT_DIR$/out/artifacts/gdms_Web_exploded + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/core/process/C_StudentSearchTeacher.java b/src/core/process/C_StudentSearchTeacher.java index 65931e4..a519a53 100644 --- a/src/core/process/C_StudentSearchTeacher.java +++ b/src/core/process/C_StudentSearchTeacher.java @@ -36,6 +36,25 @@ public class C_StudentSearchTeacher extends TempProcess{ TeacherInfo.put("phone_number",s[4]); return TeacherInfo; } + public List> _search() throws Exception{ + if(!check()) throw new GExcptInit("teacherId 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.getTeacherID()); + search.addOptions("limits",limits); + search.addOptions("start",0); + search.addOptions("end",10); + Map options = search.execute(null); + List result = (List) options.get("result"); + List> teachersInfo = new ArrayList<>(); + core.process.Utils.formatResult(result, teachersInfo); + return teachersInfo; + } protected boolean check() { if(this.getTeacherID()==null) diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index 97c1759..630664a 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -1,5 +1,6 @@ package core.process; +import core.operation.Search; import core.operation.Select; import error.GExcptInit; @@ -22,6 +23,24 @@ public class C_StudentSelectTeacher extends TempProcess { select.addOptions("teacher_id",this.getTeacherId()); Map options=select.execute(null); } + public List> search(String teacherId) throws Exception{ + Search search = new Search() ; + search.setOptions(new HashMap<>()); + search.addOptions("table","teacher"); + List fields = new ArrayList<>(); + fields.add("*"); + search.addOptions("field",fields); + Map limits = new HashMap<>(); + limits.put("id",teacherId); + search.addOptions("limits",limits); + search.addOptions("start",0); + search.addOptions("end",10); + Map options = search.execute(null); + List result = (List) options.get("result"); + List> teachersInfo = new ArrayList<>(); + core.process.Utils.formatResult(result, teachersInfo); + return teachersInfo; + } protected boolean check() { if(this.getStudentId()==null||this.getTeacherId()==null) return false; diff --git a/src/core/process/C_TeacherSearchStudent.java b/src/core/process/C_TeacherSearchStudent.java index c915c93..5696b8b 100644 --- a/src/core/process/C_TeacherSearchStudent.java +++ b/src/core/process/C_TeacherSearchStudent.java @@ -48,18 +48,11 @@ public class C_TeacherSearchStudent extends TempProcess { limits.put("id",this.getStudentId()); search.addOptions("limits",limits); search.addOptions("start",0); - search.addOptions("end",1); + search.addOptions("end",10); 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); - } + core.process.Utils.formatResult(result, studentsInfo); return studentsInfo; } protected boolean check() { diff --git a/src/core/process/C_TeacherSelectStudent.java b/src/core/process/C_TeacherSelectStudent.java index 518b368..b47f857 100644 --- a/src/core/process/C_TeacherSelectStudent.java +++ b/src/core/process/C_TeacherSelectStudent.java @@ -1,5 +1,6 @@ package core.process; +import core.operation.Search; import core.operation.Select; import error.GExcptInit; @@ -22,6 +23,24 @@ public class C_TeacherSelectStudent extends TempProcess { select.addOptions("student_id",this.getStudentId()); Map options=select.execute(null); } + public List> search(String studentId) throws Exception{ + Search search = new Search() ; + search.setOptions(new HashMap<>()); + search.addOptions("table","student"); + List fields = new ArrayList<>(); + fields.add("*"); + search.addOptions("field",fields); + Map limits = new HashMap<>(); + limits.put("id",studentId); + search.addOptions("limits",limits); + search.addOptions("start",0); + search.addOptions("end",10); + Map options = search.execute(null); + List result = (List) options.get("result"); + List> studentsInfo = new ArrayList<>(); + core.process.Utils.formatResult(result, studentsInfo); + return studentsInfo; + } protected boolean check() { if(this.getStudentId()==null||this.getTeacherId()==null) return false; diff --git a/src/core/process/Condition.java b/src/core/process/Condition.java index 14c5986..9365dbb 100644 --- a/src/core/process/Condition.java +++ b/src/core/process/Condition.java @@ -3,7 +3,7 @@ package core.process; import java.util.ArrayList; import java.util.List; -public class Condition {//条件 +public class Condition { public List getProcesses() { return processes; } diff --git a/src/core/process/Utils.java b/src/core/process/Utils.java new file mode 100644 index 0000000..9c1fc12 --- /dev/null +++ b/src/core/process/Utils.java @@ -0,0 +1,18 @@ +package core.process; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public interface Utils { + static void formatResult(List result, List> studentsInfo) { + 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); + } + } +} diff --git a/src/filter/OnlineCheck.java b/src/filter/OnlineCheck.java index e6e1ec4..7ebadb6 100644 --- a/src/filter/OnlineCheck.java +++ b/src/filter/OnlineCheck.java @@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebFilter(filterName = "OnlineCheck",urlPatterns = "/home.jsp") +@WebFilter(filterName = "OnlineCheck",urlPatterns = "/home*") public class OnlineCheck implements Filter { public void destroy() { } diff --git a/src/gdms/Configuration.java b/src/gdms/Configuration.java index 4128db3..3143a95 100644 --- a/src/gdms/Configuration.java +++ b/src/gdms/Configuration.java @@ -2,7 +2,7 @@ package gdms; public interface Configuration { //file - String filePath = "/"; + String filePath = "C:/Users/zhai_/Desktop/"; //database String dbUrl="jdbc:mariadb://localhost:3306/gdms"; String dbUsername="gdms"; diff --git a/src/servlet/S_StudentSelectTeacher.java b/src/servlet/S_StudentSelectTeacher.java index 452beaf..a71525a 100644 --- a/src/servlet/S_StudentSelectTeacher.java +++ b/src/servlet/S_StudentSelectTeacher.java @@ -26,4 +26,5 @@ public class S_StudentSelectTeacher extends HttpServlet { response.sendRedirect("/op_fail.jsp"); } } + } diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java index 23e888e..393a567 100644 --- a/src/servlet/S_StudentUploadFinishedProduct.java +++ b/src/servlet/S_StudentUploadFinishedProduct.java @@ -13,17 +13,14 @@ 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 = "000"; - //String files = request.getParameter("file"); - System.out.print("123"); - System.out.print( request.getPart("file")); - System.out.print("123"); + String id = request.getParameter("id"); + String fileURL; try { - String fileURL = servlet.Utils.saveFile(request, fileType); + fileURL = servlet.Utils.saveFile(request, fileType); }catch (Exception e) { System.out.print(e); + response.sendRedirect("/op_fail.jsp"); } - System.out.print("222"); } } diff --git a/web/home/home.jsp b/web/home/home.jsp index 11b685a..a11e5d3 100644 --- a/web/home/home.jsp +++ b/web/home/home.jsp @@ -36,7 +36,7 @@ String type=user.getType(); pageContext.setAttribute("userType",type); Condition condition=user.getCondition(); - //List pList=condition.getProcesses(); + /*List pList=condition.getProcesses();*/ int length=0; int index=0; %> diff --git a/web/home/result_list.jsp b/web/home/result_list.jsp index f2f4e13..a680834 100644 --- a/web/home/result_list.jsp +++ b/web/home/result_list.jsp @@ -7,19 +7,17 @@ --%> <%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" %> -<%String a=request.getParameter("id"); -String b[][]=new String[3][3]; -for(int i=0;i<3;i++) - for(int j=0;j<3;j++) - b[i][j]="hello"; +<% + String id=request.getParameter("id"); + String searchType=request.getParameter("searchType"); %> <%%>
-
<%=a%>
+
<%=searchType%>
<%for(int k=0;k<2;k++) for (int n=0;n<2;n++) - out.print("
电话号码："+b[k][n]+"
"); + out.print("
电话号码："+k+n+"
"); %>
电话号码：18711191679
diff --git a/web/home/select.jsp b/web/home/select.jsp index 042817e..1209b65 100644 --- a/web/home/select.jsp +++ b/web/home/select.jsp @@ -54,7 +54,7 @@
-
+
diff --git a/web/jsFile/search.js b/web/jsFile/search.js index b74575a..67502ca 100644 --- a/web/jsFile/search.js +++ b/web/jsFile/search.js @@ -1,10 +1,12 @@ $(document).ready(function () { - $(document).off('click',searchmsg).on('click','.search-button',searchmsg); - $(document).off('keydown',searchmsg).on('keydown','.search-input',KDsearchmsg); + $(document).off('click',searchStuMsg).on('click','.search-button.teacher',searchStuMsg); + $(document).off('click',searchTeaMsg).on('click','.search-button.student',searchTeaMsg); + $(document).off('keydown',KDsearchSmsg).on('keydown','.search-button.teacher',KDsearchSmsg); + $(document).off('keydown',KDsearchTmsg).on('keydown','.search-button.student',KDsearchTmsg); $(document).off('click',teacherSelect).on('click','.select-it.teacher',teacherSelect); $(document).off('click',studentSelect).on('click','.select-it.student',studentSelect); }) -function searchmsg(e) { +function searchStuMsg(e) { if($('.search-input').val()=='') { e.preventDefault(); @@ -12,15 +14,36 @@ function searchmsg(e) { } else { var id=$('.search-input').val(); - var rqDate={"id":id}; + var searchType='teacher'; + var rqDate={"id":id,"searchType":searchType}; var Url1='result_list.jsp'; $('.list-frame').load(Url1,rqDate); } } -function KDsearchmsg(e) { +function searchTeaMsg(e) { + if($('.search-input').val()=='') + { + e.preventDefault(); + alert('请输入学号'); + } + else { + var id=$('.search-input').val(); + var searchType='student'; + var rqDate={"id":id,"searchType":searchType}; + var Url1='result_list.jsp'; + $('.list-frame').load(Url1,rqDate); + } +} +function KDsearchSmsg(e) { + if(e.keyCode==13) + { + searchStuMsg(e); + } +} +function KDsearchTmsg(e) { if(e.keyCode==13) { - searchmsg(e); + searchTeaMsg(e); } } function select_one(Url2,button) { diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js index 866ac3a..7f0de15 100644 --- a/web/jsFile/upload_action.js +++ b/web/jsFile/upload_action.js @@ -5,7 +5,7 @@ $(document).ready(function () { }) function sendFile() { var fileData =new FormData(); - var Url4='student-upload-finished-product'; + var Url4='/student-upload-finished-product'; var file=$('#select')[0].files[0]; if($('.true-select').val()=='') {