From 713dc29a3124db7674f71f188ce211734efb5ac3 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Fri, 11 Jan 2019 09:51:14 +0800 Subject: [PATCH 1/7] Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wmj --- src/core/process/Process.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/process/Process.java b/src/core/process/Process.java index 966aa17..b4a597b 100644 --- a/src/core/process/Process.java +++ b/src/core/process/Process.java @@ -7,11 +7,11 @@ import error.GExcptSQL; public abstract class Process { - private String permission; - private Operation operation; - private String buttonName; - private String info; - private String processOptions; + private String permission;//权限 + private Operation operation;//操作 + private String buttonName;//按键 + private String info;//信息 + private String processOptions;//进程操作 public Process(String permission, String operationName, String processOptions, String info) throws Exception { super(); From ac773da1d52ae81de138d823a5ef00f4d5609d6b Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Sat, 12 Jan 2019 10:28:05 +0800 Subject: [PATCH 2/7] Merge remote-tracking branch 'remotes/origin/master' into wmj # Conflicts: # src/core/process/Process.java --- .idea/jsonSchemas.xml | 25 ++++++++++ .idea/misc.xml | 2 +- src/core/process/AuxiliaryProcess.java | 7 --- .../process/Cls_TeacherSelectStudent.java | 17 +++++++ src/core/process/Condition.java | 2 +- src/core/process/LastProcess.java | 8 --- src/core/process/Process.java | 50 +++---------------- src/core/process/ProcessManagement.java | 10 ++-- src/core/process/TemporaryProcess.java | 9 ---- .../account/Srvlt_TeacherSelectStudent.java | 19 +++++++ 10 files changed, 74 insertions(+), 75 deletions(-) create mode 100644 .idea/jsonSchemas.xml delete mode 100644 src/core/process/AuxiliaryProcess.java create mode 100644 src/core/process/Cls_TeacherSelectStudent.java delete mode 100644 src/core/process/LastProcess.java delete mode 100644 src/core/process/TemporaryProcess.java create mode 100644 src/servlet/account/Srvlt_TeacherSelectStudent.java diff --git a/.idea/jsonSchemas.xml b/.idea/jsonSchemas.xml new file mode 100644 index 0000000..8ae97b9 --- /dev/null +++ b/.idea/jsonSchemas.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + \ No newline at end of file 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/src/core/process/AuxiliaryProcess.java b/src/core/process/AuxiliaryProcess.java deleted file mode 100644 index 526c5fc..0000000 --- a/src/core/process/AuxiliaryProcess.java +++ /dev/null @@ -1,7 +0,0 @@ -package core.process; - -public class AuxiliaryProcess extends Process { - public AuxiliaryProcess(String permission, String operationName, String processOptions, String info) throws Exception { - super(permission, operationName, processOptions, info); - } -} diff --git a/src/core/process/Cls_TeacherSelectStudent.java b/src/core/process/Cls_TeacherSelectStudent.java new file mode 100644 index 0000000..4019e46 --- /dev/null +++ b/src/core/process/Cls_TeacherSelectStudent.java @@ -0,0 +1,17 @@ +//package core.process; +//// +////import java.util.ArrayList; +////import java.util.List; +//// +////public class Cls_TeacherSelectStudent extends Process { +//// List list; +//// +//// public Cls_TeacherSelectStudent clone(){ +//// Cls_TeacherSelectStudent tst = new Cls_TeacherSelectStudent(); +//// tst.setInfo( this.getInfo()); +//// List list = new ArrayList<>(); +//// for(String s:this.list){ +//// list.add(new String(s)); +//// } +//// } +////} diff --git a/src/core/process/Condition.java b/src/core/process/Condition.java index 9365dbb..14c5986 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/LastProcess.java b/src/core/process/LastProcess.java deleted file mode 100644 index 4c48117..0000000 --- a/src/core/process/LastProcess.java +++ /dev/null @@ -1,8 +0,0 @@ -package core.process; - -public class LastProcess extends Process{ - - public LastProcess(String permission, String operationName, String processOptions, String info) throws Exception { - super(permission, operationName, processOptions, info); - } -} diff --git a/src/core/process/Process.java b/src/core/process/Process.java index bcdf14f..14cb3a5 100644 --- a/src/core/process/Process.java +++ b/src/core/process/Process.java @@ -7,43 +7,19 @@ import error.GExcptSQL; public abstract class Process implements Cloneable{ - private String permission; - private Operation operation; - private String buttonName; - private String info; - private String processOptions; - private String UserOptions; + private static String permission; + private static String buttonName; + private static String info; + + @Override public Process clone(){ //todo return null; - } - public Process(String permission, String operationName, String processOptions, String info) throws Exception { - super(); - this.setPermission(permission); - this.setOperation(operationName); - this.setInfo(info); - this.setProcessOptions(processOptions); - operation.setProcessOperations(processOptions); - } - public void setUserOperations(String key,Object value){ - this.operation.addUserOperations(key,value); - } - public void execute(User subject) throws GExcptSQL { - this.operation.execute(subject); - } - private void setOperation(String operationName) throws GExcptFactory { - try { - this.operation = (Operation) core.utils.GetObjectByName.getOperationByName(operationName); - } catch (Exception e) { - throw new GExcptFactory("create"+operationName+"failure"); - } } - public void setInfo(String info) { - this.info = info; - } + public void setInfo(String info) { this.info = info; } public String getButtonName() { return buttonName; } @@ -61,20 +37,6 @@ public abstract class Process implements Cloneable{ this.permission = permission; } - public Operation getOperation() { - return operation; - } - - public void setOperation(Operation operation) { - this.operation = operation; - } - public String getProcessOptions() { - return processOptions; - } - - public void setProcessOptions(String processOptions) { - this.processOptions = processOptions; - } } diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index aafefa0..2bc030c 100644 --- a/src/core/process/ProcessManagement.java +++ b/src/core/process/ProcessManagement.java @@ -4,14 +4,14 @@ import java.io.File; import java.util.List; import java.util.Map; -public class ProcessManagement { - private List temporaryProcesses; +public class ProcessManagement {//过程管理 + //private List temporaryProcesses; private Map> lastProcesses; - private List auxiliaryProcesses; + //private List auxiliaryProcesses; public void setProcessesByJson(File file){ //todo } - public Process getTemporaryProcess(int index){ + /*public Process getTemporaryProcess(int index){ return temporaryProcesses.get(index).clone(); } public Condition getCondition(String userType, List index){ @@ -20,6 +20,6 @@ public class ProcessManagement { condition.add(getTemporaryProcess(i)); } return condition; - } + }*/ } diff --git a/src/core/process/TemporaryProcess.java b/src/core/process/TemporaryProcess.java deleted file mode 100644 index 3f22949..0000000 --- a/src/core/process/TemporaryProcess.java +++ /dev/null @@ -1,9 +0,0 @@ -package core.process; - - - -public class TemporaryProcess extends Process { - public TemporaryProcess(String permission, String operationName, String processOptions, String info) throws Exception { - super(permission, operationName, processOptions, info); - } -} diff --git a/src/servlet/account/Srvlt_TeacherSelectStudent.java b/src/servlet/account/Srvlt_TeacherSelectStudent.java new file mode 100644 index 0000000..1f47db0 --- /dev/null +++ b/src/servlet/account/Srvlt_TeacherSelectStudent.java @@ -0,0 +1,19 @@ +package servlet.account; + +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 = "Srvlt_TeacherSelectStudent") +public class Srvlt_TeacherSelectStudent extends HttpServlet { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + } +} From 776ed667b86e1f6d514565a27d5e794d6f9904fe Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Sat, 12 Jan 2019 11:22:11 +0800 Subject: [PATCH 3/7] Merge remote-tracking branch 'remotes/origin/master' into wmj # Conflicts: # src/core/process/Process.java # src/core/process/ProcessManagement.java --- src/core/process/C_TeacherSelectStudent.java | 33 ++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/core/process/C_TeacherSelectStudent.java b/src/core/process/C_TeacherSelectStudent.java index 246a420..93ca38e 100644 --- a/src/core/process/C_TeacherSelectStudent.java +++ b/src/core/process/C_TeacherSelectStudent.java @@ -1,17 +1,18 @@ package core.process; -//// -////import java.util.ArrayList; -////import java.util.List; -//// -////public class Cls_TeacherSelectStudent extends Process { -//// List list; -//// -//// public Cls_TeacherSelectStudent clone(){ -//// Cls_TeacherSelectStudent tst = new Cls_TeacherSelectStudent(); -//// tst.setInfo( this.getInfo()); -//// List list = new ArrayList<>(); -//// for(String s:this.list){ -//// list.add(new String(s)); -//// } -//// } -////} + +import java.util.ArrayList; +import java.util.List; + +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; + } +} From 97f6d812b330dc7d9eb564b317f091d60b051238 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Sat, 12 Jan 2019 12:37:09 +0800 Subject: [PATCH 4/7] Merge remote-tracking branch 'remotes/origin/master' into wmj # Conflicts: # src/core/process/Process.java # src/core/process/ProcessManagement.java --- src/core/operation/Search.json | 2 +- src/core/process/C_StudentSearchTeacher.java | 28 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/core/process/C_StudentSearchTeacher.java diff --git a/src/core/operation/Search.json b/src/core/operation/Search.json index 5dfe358..f5f2a01 100644 --- a/src/core/operation/Search.json +++ b/src/core/operation/Search.json @@ -1,7 +1,7 @@ { "options":{ "table": "String", - "fields": "List", + "fields": "List", "value": "String", "start": "int", "end": "int" diff --git a/src/core/process/C_StudentSearchTeacher.java b/src/core/process/C_StudentSearchTeacher.java new file mode 100644 index 0000000..3fb1086 --- /dev/null +++ b/src/core/process/C_StudentSearchTeacher.java @@ -0,0 +1,28 @@ +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; +import java.util.Map; + +public class C_StudentSearchTeacher { + Map TeacherInfo=new HashMap(); + public Map search(String TeacherID){ + 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); + return TeacherInfo; + } + +} 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 5/7] 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); + } + + } From dfcd434b0764ac78971c383bbc6791c22a3664f5 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Sat, 12 Jan 2019 17:43:49 +0800 Subject: [PATCH 6/7] Merge remote-tracking branch 'remotes/origin/master' into wmj # Conflicts: # src/core/operation/Search.json --- .../356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml | 60 +++++++++---------- src/core/process/C_StudentSearchTeacher.java | 1 - 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml index 2d697f3..79ab581 100644 --- a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml @@ -1735,77 +1735,77 @@ 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 + + 10 + char(1)|0s + normal + + + 11 + char(1)|0s + normal + + + 12 + char(1)|0s + normal + + + 13 + char(1)|0s + normal + 1 id diff --git a/src/core/process/C_StudentSearchTeacher.java b/src/core/process/C_StudentSearchTeacher.java index cb775e2..2bb3080 100644 --- a/src/core/process/C_StudentSearchTeacher.java +++ b/src/core/process/C_StudentSearchTeacher.java @@ -29,5 +29,4 @@ public class C_StudentSearchTeacher { TeacherInfo.put("name",s[2]); return TeacherInfo; } - } From b6f6e5c73ba8455ac4d946ebd390b38be257e1ed Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Sat, 12 Jan 2019 17:44:20 +0800 Subject: [PATCH 7/7] Merge remote-tracking branch 'remotes/origin/master' into wmj # Conflicts: # src/core/operation/Search.json --- src/core/process/C_TeacherSearchStudent.java | 32 ++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/core/process/C_TeacherSearchStudent.java diff --git a/src/core/process/C_TeacherSearchStudent.java b/src/core/process/C_TeacherSearchStudent.java new file mode 100644 index 0000000..8fe27b0 --- /dev/null +++ b/src/core/process/C_TeacherSearchStudent.java @@ -0,0 +1,32 @@ +package core.process; + +import core.operation.Search; + +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{ + 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); + 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); + StudentInfo.put("id",s[0]); + StudentInfo.put("name",s[2]); + return StudentInfo; + } +}