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] 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 { + + } +}