diff --git a/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml b/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml index cf34b4f..b9251ad 100644 --- a/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml +++ b/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml @@ -1917,12 +1917,12 @@ char(20)|0s normal - + 4 text|0s normal - + 5 date|0s normal @@ -1932,7 +1932,7 @@ text|0s normal - + 7 date|0s normal @@ -1982,17 +1982,17 @@ date|0s normal - + 17 char(1)|0s normal - + 18 char(1)|0s normal - + 19 char(1)|0s normal diff --git a/.idea/dictionaries/zhai_.xml b/.idea/dictionaries/zhai_.xml new file mode 100644 index 0000000..826cb6a --- /dev/null +++ b/.idea/dictionaries/zhai_.xml @@ -0,0 +1,7 @@ + + + + mariadb + + + \ No newline at end of file diff --git a/src/core/process/C_CollegeFillOpeningReportOpinion.java b/src/core/process/C_CollegeFillOpeningReportOpinion.java index 81a18e4..0bcfad0 100644 --- a/src/core/process/C_CollegeFillOpeningReportOpinion.java +++ b/src/core/process/C_CollegeFillOpeningReportOpinion.java @@ -11,7 +11,7 @@ import java.util.Map; public class C_CollegeFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; - private static String buttonName ="学院开题意见"; + protected static String buttonName ="学院开题意见"; protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/college-fill-opening-report-opinion"; diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java index e15869b..e37ca3a 100644 --- a/src/core/process/C_CollegeFillScoreOpinion.java +++ b/src/core/process/C_CollegeFillScoreOpinion.java @@ -12,7 +12,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{ String graduationDesignId; Map vMap; - private static String buttonName ="学院老师评分"; + protected static String buttonName ="学院老师评分"; protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/college-fill-score-opinion"; static String table="graduation_design_reply_opinion_record_score"; diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index 9f5ab53..c1e42e6 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -12,7 +12,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; - private static String buttonName ="导师开题意见"; + protected static String buttonName ="导师开题意见"; protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/mentor-fill-opening-report-opinion"; diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java index 49c6402..38a90b8 100644 --- a/src/core/process/C_MentorFillReview.java +++ b/src/core/process/C_MentorFillReview.java @@ -12,7 +12,7 @@ public class C_MentorFillReview extends TempProcess { public String graduationDesignId; public Map vMap; - private static String buttonName ="指导老师评阅"; + protected static String buttonName ="指导老师评阅"; protected static String targetURL="/home/mentor-fill-review"; protected static String iconURL="../cssFile/images/fill.png"; diff --git a/src/core/process/C_ReviewerFillReview.java b/src/core/process/C_ReviewerFillReview.java index d501066..acc6fe8 100644 --- a/src/core/process/C_ReviewerFillReview.java +++ b/src/core/process/C_ReviewerFillReview.java @@ -11,7 +11,7 @@ import java.util.Map; public class C_ReviewerFillReview extends TempProcess { public String graduationDesignId; public Map vMap; - private static String buttonName ="评阅老师评阅"; + protected static String buttonName ="评阅老师评阅"; protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/reviewer-fill-review"; diff --git a/src/core/process/C_SchoolFillScoreOpinion.java b/src/core/process/C_SchoolFillScoreOpinion.java index e512506..063ff4f 100644 --- a/src/core/process/C_SchoolFillScoreOpinion.java +++ b/src/core/process/C_SchoolFillScoreOpinion.java @@ -12,7 +12,7 @@ public class C_SchoolFillScoreOpinion extends TempProcess { String graduationDesignId; Map vMap; - private static String buttonName ="学院老师评分"; + protected static String buttonName ="学院老师评分"; protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/school-fill-score-opinion"; diff --git a/src/core/process/C_SecretaryFillOpeningReportRecord.java b/src/core/process/C_SecretaryFillOpeningReportRecord.java index 011b507..a5d94d8 100644 --- a/src/core/process/C_SecretaryFillOpeningReportRecord.java +++ b/src/core/process/C_SecretaryFillOpeningReportRecord.java @@ -12,7 +12,7 @@ public class C_SecretaryFillOpeningReportRecord extends TempProcess{ String graduationDesignId; Map vMap; - private static String buttonName ="提交开题纪要"; + protected static String buttonName ="提交开题纪要"; protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/secretary-fill-opening-report-record"; diff --git a/src/core/process/C_SecretaryFillReplyRecord.java b/src/core/process/C_SecretaryFillReplyRecord.java index 17557dd..5f94edc 100644 --- a/src/core/process/C_SecretaryFillReplyRecord.java +++ b/src/core/process/C_SecretaryFillReplyRecord.java @@ -12,7 +12,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{ String graduationDesignId; Map vMap; - private static String buttonName ="提交答辩记录"; + protected static String buttonName ="提交答辩记录"; protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/secretary-fill-reply-record"; diff --git a/src/core/process/C_StudentFillGraduationDesignInformation.java b/src/core/process/C_StudentFillGraduationDesignInformation.java index 6462ecf..39847d5 100644 --- a/src/core/process/C_StudentFillGraduationDesignInformation.java +++ b/src/core/process/C_StudentFillGraduationDesignInformation.java @@ -11,7 +11,7 @@ import java.util.Map; public class C_StudentFillGraduationDesignInformation extends TempProcess{ String graduationDesignId; Map vMap; - private static String buttonName ="填写选题信息"; + protected static String buttonName ="填写选题信息"; protected static String iconURL="../cssFile/images/filText.png"; protected static String targetURL="/home/student-fill-graduation-design-information"; diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index d4e57ca..f035eba 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -12,7 +12,7 @@ import java.util.Map; public class C_StudentSelectTeacher extends TempProcess { String studentId; String teacherId; - private static String buttonName ="选择老师"; + protected static String buttonName ="选择老师"; protected static String targetURL="/home/student-select-teacher"; protected static String iconURL="../cssFile/images/select.png"; diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java index 8bb0ea3..5dc291f 100644 --- a/src/core/process/C_StudentUploadFinishedProduct.java +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -11,7 +11,7 @@ public class C_StudentUploadFinishedProduct extends TempProcess { File finishedProduct; String graduationDesignId; - private static String buttonName ="提交定稿"; + protected static String buttonName ="提交定稿"; protected static String iconURL="../cssFile/images/upload.png"; protected static String targetURL="/home/student-upload-finished-product"; diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java index 3ccb7e3..134cd91 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -10,7 +10,7 @@ import java.util.Map; public class C_StudentUploadOpeningReport extends TempProcess{ File openingReport; String graduationDesignId; - private static String buttonName ="提交开题报告"; + protected static String buttonName ="提交开题报告"; static String file_type = "opening_report"; protected static String targetURL="/home/student-upload-opening-report"; protected static String iconURL="../cssFile/images/upload.png"; diff --git a/src/core/process/C_TeacherSelectStudent.java b/src/core/process/C_TeacherSelectStudent.java index acb5021..1575dff 100644 --- a/src/core/process/C_TeacherSelectStudent.java +++ b/src/core/process/C_TeacherSelectStudent.java @@ -12,7 +12,7 @@ import java.util.Map; public class C_TeacherSelectStudent extends TempProcess { String studentId; String teacherId; - private static String buttonName ="选择学生"; + protected static String buttonName ="选择学生"; protected static String iconURL=""; protected static String targetURL="/home/teacher-select-student"; diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java index 467dc50..4c67c1f 100644 --- a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java +++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java @@ -12,7 +12,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; - private static String buttonName ="开题小组意见"; + protected static String buttonName ="开题小组意见"; protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/teacher-team-fill-opening-report-opinion"; diff --git a/src/core/process/C_TeacherTeamFillScoreOpinion.java b/src/core/process/C_TeacherTeamFillScoreOpinion.java index 8a223a8..b25dc7a 100644 --- a/src/core/process/C_TeacherTeamFillScoreOpinion.java +++ b/src/core/process/C_TeacherTeamFillScoreOpinion.java @@ -10,7 +10,7 @@ import java.util.Map; public class C_TeacherTeamFillScoreOpinion extends TempProcess { - private static String buttonName = "答辩小组评分"; + protected static String buttonName = "答辩小组评分"; protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/teacher-team-fill-score-opinion"; String graduationDesignId; diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index 02f456c..a800b13 100644 --- a/src/core/process/ProcessManagement.java +++ b/src/core/process/ProcessManagement.java @@ -15,7 +15,7 @@ public class ProcessManagement { public static Condition getCondition(User user, Map status){ Condition condition = new Condition(); for(Map.Entry entry:status.entrySet()){ - String[] s = entry.getKey().split("."); + String[] s = entry.getKey().split("\\."); TempProcess tempProcess = (TempProcess) getProcess(s[1]); tempProcess.setGraduationDesignId(s[0]); tempProcess.setStatus(entry.getValue()); @@ -26,17 +26,18 @@ public class ProcessManagement { } private static List getLastProcesses(User user) { - return null; + List lp = new ArrayList<>(); + return lp; } //Map public static Map getStatus(User user) throws Exception { Map status = new HashMap<>(); - Map userTables = DBManagement.getUserStatusTables(user.getType()); + String[][] userTables = DBManagement.getUserStatusTables(user.getType()); String graduationDesignId = null; - for(Map.Entry entry:userTables.entrySet()){ - String[] ti = entry.getKey().split("\\."); - String[] ts = entry.getValue().split("\\."); + for(String[] s:userTables){ + String[] ti = s[0].split("\\."); + String[] ts = s[1].split("\\."); List ls = new ArrayList<>(); ls.add("id"); Map limits = new HashMap<>(); diff --git a/src/core/user/utils/AccountManagement.java b/src/core/user/utils/AccountManagement.java index 3c03ede..d9c4ebd 100644 --- a/src/core/user/utils/AccountManagement.java +++ b/src/core/user/utils/AccountManagement.java @@ -75,12 +75,18 @@ public interface AccountManagement { vMap.put("id",id); DBManagement.insert(table,vMap); } - for(Map.Entry entry:DBManagement.allStatus.entrySet()){ + for(String[] s:DBManagement.allStatus){ Map vMap = new HashMap<>(); Map limits = new HashMap<>(); limits.put("id",id); - vMap.put(entry.getValue(),defaultStatus); - DBManagement.update(entry.getKey(),vMap,limits); + vMap.put(s[1],defaultStatus); + DBManagement.update(s[0],vMap,limits); } + // + Map vMap = new HashMap<>(); + Map limits = new HashMap<>(); + limits.put("id",id); + vMap.put("student_id",id); + DBManagement.update("graduation_design",vMap,limits); } } diff --git a/src/dao/DBManagement.java b/src/dao/DBManagement.java index f314ac5..31a24eb 100644 --- a/src/dao/DBManagement.java +++ b/src/dao/DBManagement.java @@ -2,7 +2,6 @@ package dao; import java.sql.*; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import error.GExcptSQL; @@ -56,56 +55,49 @@ public class DBManagement { "phone_number" }; // - public static Map graduationDesignStudentTables = new HashMap<>(){ - { - put("graduation_design.student_id","graduation_design.student_chooser_teacher_status"); - 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 String[][] graduationDesignStudentTables ={ + {"graduation_design.student_id","graduation_design.student_choose_teacher_status"}, + {"graduation_design.student_id","graduation_design_information.student_fill_graduation_design_information_status"}, + {"graduation_design.student_id","graduation_design_opening_report.opening_report_status"}, + {"graduation_design_opening_report_view.leader_student_id","graduation_design_opening_report_opinion_record.opening_report_secretary_record_status"}, + {"graduation_design_opening_report_view.student1_id","graduation_design_opening_report_opinion_record.opening_report_secretary_record_status"}, + {"graduation_design_opening_report_view.student2_id","graduation_design_opening_report_opinion_record.opening_report_secretary_record_status"}, + {"graduation_design.student_id","graduation_design_finished_product.finished_product_status"}, + {"graduation_design_reply_view.leader_student_id","graduation_design_reply_opinion_record_score.reply_secretary_record_status"}, + {"graduation_design_reply_view.teacher1_id","graduation_design_reply_opinion_record_score.reply_secretary_record_status"}, + {"graduation_design_reply_view.teacher2_id","graduation_design_reply_opinion_record_score.reply_secretary_record_status"} }; - public static Map graduationDesignTeacherTables = new HashMap<>(){ - { - 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[][] graduationDesignTeacherTables = { + {"graduation_design.teacher_id","graduation_design.teacher_choose_student_status"}, + {"graduation_design.teacher_id","graduation_design_opening_report_opinion_record.opening_report_mentor_opinion_status"}, + {"graduation_design_opening_report_view.leader_teacher_id","graduation_design_opening_report_opinion_record.opening_report_teacher_team_opinion_status"}, + {"graduation_design_opening_report_view.teacher1_id","graduation_design_opening_report_opinion_record.opening_report_teacher_team_opinion_status"}, + {"graduation_design_opening_report_view.teacher2_id","graduation_design_opening_report_opinion_record.opening_report_teacher_team_opinion_status"}, + {"graduation_design_opening_report_opinion_record.opening_report_college_teacher_id","graduation_design_opening_report_opinion_record.opening_report_college_opinion_status"}, + {"graduation_design.teacher_id","graduation_design_finished_product_mentor_score.finished_product_mentor_score_status"}, + {"graduation_design_finished_product_reviewer_score.reviewer_teacher_id","graduation_design_finished_product_reviewer_score.finished_product_reviewer_score_status"}, + {"graduation_design_reply_view.leader_teacher_id","graduation_design_reply_opinion_record_score.reply_teacher_team_score_status"}, + {"graduation_design_reply_view.teacher1_id","graduation_design_reply_opinion_record_score.reply_teacher_team_score_status"}, + {"graduation_design_reply_view.teacher2_id","graduation_design_reply_opinion_record_score.reply_teacher_team_score_status"}, + {"graduation_design_reply_opinion_record_score.reply_college_teacher_id","graduation_design_reply_opinion_record_score.reply_college_score_status"}, + {"graduation_design_reply_opinion_record_score.reply_school_teacher_id","graduation_design_reply_opinion_record_score.reply_school_score_status"} }; - public static Map allStatus = new HashMap<>(){ - { - put("graduation_design","teacher_choose_student_status"); - put("graduation_design","student_choose_teacher_status"); - put("graduation_design_information","student_fill_graduation_design_information_status"); - put("graduation_design_opening_report","opening_report_status"); - put("graduation_design_opening_report_opinion_record","opening_report_mentor_opinion_status"); - put("graduation_design_opening_report_opinion_record","opening_report_teacher_team_opinion_status"); - put("graduation_design_opening_report_opinion_record","opening_report_college_opinion_status"); - put("graduation_design_opening_report_opinion_record","opening_report_secretary_record_status"); - put("graduation_design_finished_product","finished_product_status"); - put("graduation_design_finished_product_mentor_score","finished_product_mentor_score_status"); - put("graduation_design_finished_product_reviewer_score","finished_product_reviewer_score_status"); - put("graduation_design_reply_opinion_record_score","reply_ secretary_record_status"); - put("graduation_design_reply_opinion_record_score","reply_ teacher_team_score_status"); - put("graduation_design_reply_opinion_record_score","reply_college_score_status"); - put("graduation_design_reply_opinion_record_score","reply_school_score_status"); - - } + public static String[][] allStatus = { + {"graduation_design","teacher_choose_student_status"}, + {"graduation_design","student_choose_teacher_status"}, + {"graduation_design_information","student_fill_graduation_design_information_status"}, + {"graduation_design_opening_report","opening_report_status"}, + {"graduation_design_opening_report_opinion_record","opening_report_mentor_opinion_status"}, + {"graduation_design_opening_report_opinion_record","opening_report_teacher_team_opinion_status"}, + {"graduation_design_opening_report_opinion_record","opening_report_college_opinion_status"}, + {"graduation_design_opening_report_opinion_record","opening_report_secretary_record_status"}, + {"graduation_design_finished_product","finished_product_status"}, + {"graduation_design_finished_product_mentor_score","finished_product_mentor_score_status"}, + {"graduation_design_finished_product_reviewer_score","finished_product_reviewer_score_status"}, + {"graduation_design_reply_opinion_record_score","reply_secretary_record_status"}, + {"graduation_design_reply_opinion_record_score","reply_teacher_team_score_status"}, + {"graduation_design_reply_opinion_record_score","reply_college_score_status"}, + {"graduation_design_reply_opinion_record_score","reply_school_score_status"} }; public static String driverClassName="org.mariadb.jdbc.Driver"; @@ -138,7 +130,7 @@ public class DBManagement { } return null; } - public static Map getUserStatusTables(String userType){ + public static String[][] getUserStatusTables(String userType){ if(userType.equals("student")){ return graduationDesignStudentTables; } @@ -198,7 +190,7 @@ public class DBManagement { ls.add(s); } } catch (SQLException e) { - throw new GExcptSQL("Connect Failure"); + throw new GExcptSQL("Connect Failure\n"+sql); }finally { if(con!=null) { try { @@ -218,7 +210,7 @@ public class DBManagement { Statement stmt = con.createStatement(); stmt.executeUpdate(sql); } catch (SQLException e) { - throw new GExcptSQL("Connect Failure"); + throw new GExcptSQL("Connect Failure\n"+sql); }finally { if(con!=null) { try { diff --git a/src/servlet/S_StudentSelectTeacher.java b/src/servlet/S_StudentSelectTeacher.java index a71525a..618e323 100644 --- a/src/servlet/S_StudentSelectTeacher.java +++ b/src/servlet/S_StudentSelectTeacher.java @@ -1,6 +1,5 @@ package servlet; -import core.process.C_StudentSearchTeacher; import core.process.C_StudentSelectTeacher; import core.user.User; import javax.servlet.ServletException; diff --git a/web/home/select.jsp b/web/home/select.jsp index 1209b65..4f5fe83 100644 --- a/web/home/select.jsp +++ b/web/home/select.jsp @@ -11,7 +11,6 @@ <%@ 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"%>