From 3cbe7c42d8d7274fa6bbfad9a30272358fccee04 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Sat, 12 Jan 2019 15:49:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into wmj # Conflicts: # src/core/operation/Search.json --- .../356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml | 985 +++++++++--------- src/core/process/C_StudentSearchTeacher.java | 17 +- src/core/process/C_StudentSelectTeacher.java | 20 +- src/core/process/C_TeacherSelectStudent.java | 15 + 4 files changed, 536 insertions(+), 501 deletions(-) diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml index 44954d9..2d697f3 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,2117 @@ 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 - + 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 date|0s normal - + 8 text|0s normal - + 9 date|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 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/src/core/process/C_StudentSearchTeacher.java b/src/core/process/C_StudentSearchTeacher.java index 3fb1086..cb775e2 100644 --- a/src/core/process/C_StudentSearchTeacher.java +++ b/src/core/process/C_StudentSearchTeacher.java @@ -1,12 +1,7 @@ package core.process; - - -import core.operation.Operation; import core.operation.Search; -import core.user.User; -import java.sql.ResultSet; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -14,7 +9,7 @@ import java.util.Map; public class C_StudentSearchTeacher { Map TeacherInfo=new HashMap(); - public Map search(String TeacherID){ + public Map search(String teacherID) throws Exception { Search search = new Search() ; search.setOptions(new HashMap<>()); String table = "teacher"; @@ -22,6 +17,16 @@ public class C_StudentSearchTeacher { 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",1); + Map options = search.execute(null); + List result = (List) options.get("result"); + String[] s = result.get(0); + TeacherInfo.put("id",s[0]); + TeacherInfo.put("name",s[2]); return TeacherInfo; } diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index f1552c4..e60acc8 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -1,4 +1,22 @@ package core.process; -public class C_StudentSelectTeacher { +import core.operation.Select; + +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{ + 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); + Map options=select.execute(null); + } + + } diff --git a/src/core/process/C_TeacherSelectStudent.java b/src/core/process/C_TeacherSelectStudent.java index 93ca38e..a13ef73 100644 --- a/src/core/process/C_TeacherSelectStudent.java +++ b/src/core/process/C_TeacherSelectStudent.java @@ -1,7 +1,11 @@ package core.process; +import core.operation.Select; + import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class C_TeacherSelectStudent extends Process { List list; @@ -15,4 +19,15 @@ public class C_TeacherSelectStudent extends Process { } return null; } + public void select(String teacherID,String studentID)throws Exception{ + 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); + Map options=select.execute(null); + } + + }