完善gdms，

完成用户流程

deployment/context.xml

@@ -4,7 +4,7 @@
               name="jdbc/gdms"
               factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
               driverClassName="com.mysql.jdbc.Driver"
-              url="jdbc:mariadb://localhost:3306/gdms"
+              targetURL="jdbc:mariadb://localhost:3306/gdms"
               username="gdms"
               password="GDMS"/>
 </Context>

documents/GDMS_DB_Design .txt

@@ -3,7 +3,7 @@ password char 256
 name varchar 50
 e_mail_location varchar 50
 phonenumber varchar 30
-url varchar 256
+targetURL varchar 256
 
 administrator
     id

documents/数据库.txt

@@ -3,7 +3,7 @@ password char 255//用户密码
 name char 30//用户姓名
 e_mail_location char 40//邮箱
 phone_number char 20//电话号码
-url varchar 255//......路径
+targetURL varchar 255//......路径
 
 administrator//管理员
     id//管理员ID

src/core/operation/UploadFile.java

@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class UploadFileOperation extends Operation {
+public class UploadFile extends Operation {
     @Override
     public Map<String, Object> execute(User subject) throws Exception {
         File file = (File) this.getOptions().get("file");

src/core/process/Process.java

@@ -4,12 +4,14 @@ import core.operation.Operation;
 
 public abstract class Process{
 
-    private char status;
+    private String status;
 
     private String permission;
     private Operation operation;
-    private String buttonName;
     private String info;
+    private static String buttonName;
+    protected static String targetURL;
+    protected static String iconURL;
 
     public String getPermission() {
         return permission;
@@ -31,10 +33,6 @@ public abstract class Process{
         return buttonName;
     }
 
-    public void setButtonName(String buttonName) {
-        this.buttonName = buttonName;
-    }
-
     public String getInfo() {
         return info;
     }
@@ -43,11 +41,19 @@ public abstract class Process{
         this.info = info;
     }
 
-    public char getStatus() {
+    public String getStatus() {
         return status;
     }
 
-    public void setStatus(char status) {
+    public void setStatus(String status) {
         this.status = status;
     }
+
+    public static String getTargetURL() {
+        return targetURL;
+    }
+
+    public static String getIconURL() {
+        return iconURL;
+    }
 }

src/core/process/ProcessManagement.java

@@ -2,17 +2,19 @@ package core.process;
 import core.user.User;
 import dao.DBManagement;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class ProcessManagement {
-    public static Condition getCondition(User user) {
-        Map<String,Character> status = getStatus(user);
+    public static Condition getCondition(User user) throws Exception {
+        Map<String,String> status = getStatus(user);
         return getCondition(user,status);
     }
-    public static Condition getCondition(User user, Map<String,Character> status){
+    public static Condition getCondition(User user, Map<String, String> status){
         Condition condition = new Condition();
-        for(Map.Entry<String,Character> entry:status.entrySet()){
+        for(Map.Entry<String,String> entry:status.entrySet()){
             String[] s = entry.getKey().split(".");
             TempProcess tempProcess = (TempProcess) getProcess(s[1]);
             tempProcess.setGraduationDesignId(s[0]);
@@ -28,17 +30,29 @@ public class ProcessManagement {
     }
 
     //Map<graduation_design_id.x_status,status>
-    public static Map<String,Character> getStatus(User user){
-
+    public static Map<String,String> getStatus(User user) throws Exception {
+        Map<String, String> status = new HashMap<>();
         Map<String,String> userTables = DBManagement.getUserStatusTables(user.getType());
         String graduationDesignId = null;
         for(Map.Entry<String,String> entry:userTables.entrySet()){
             String[] ti = entry.getKey().split(".");
             String[] ts = entry.getValue().split(".");
+            List<String> ls = new ArrayList<>();
+            ls.add("id");
+            Map<String,String> limits = new HashMap<>();
+            limits.put(ti[1],user.getId());
+            List<String[]> resultLs = DBManagement.select(ls,ti[0],limits,0,1);
+            if(resultLs.size()==0) continue;
+            graduationDesignId = resultLs.get(0)[0];
 
-        }
-
-        return null;
+            ls = new ArrayList<>();
+            ls.add(ts[1]);
+            limits = new HashMap<>();
+            limits.put("id",graduationDesignId);
+            resultLs = DBManagement.select(ls,ts[0],limits,0,1);
+            status.put(graduationDesignId+"."+ts[1],resultLs.get(0)[0]);
+        }
+        return status;
     }
     public static Process getProcess(String process){
         return null;

src/error/GExcptInit.java

@@ -0,0 +1,7 @@
+package error;
+
+public class GExcptInit extends GExcpt {
+    public GExcptInit(String info) {
+        super(info);
+    }
+}

src/gdms/GDMS.java

@@ -0,0 +1,34 @@
+package gdms;
+
+import error.GExcptInit;
+
+import java.util.*;
+
+public class GDMS {
+    static Map<String, Date> schedules;
+    static String schedulePath = "";
+    public static void init() throws GExcptInit {
+        initSchedule();
+        Timer timer = new Timer(true);
+        for(Map.Entry<String, Date> schedule:schedules.entrySet()){
+            timer.schedule(getTimerTask(schedule.getKey()),schedule.getValue());
+        }
+    }
+
+    private static TimerTask getTimerTask(String s) throws GExcptInit {
+        if(s==""){
+            return new TimerTask() {
+                @Override
+                public void run() {
+                    ;
+                }
+            };
+        }
+
+        throw new GExcptInit("GlobalTimePoint.json error");
+    }
+
+    private static void initSchedule() {
+
+    }
+}

src/gdms/GlobalTimePoint.json

@@ -0,0 +1,3 @@
+{
+  "":""
+}

src/gdms/main.java

@@ -1,18 +0,0 @@
-package gdms;
-
-public class main {
-    public static void check()throws Exception{
-        checkJson();
-    }
-
-    private static void checkJson() throws Exception{
-        //todo
-    }
-
-    public static void init(){
-    }
-    public static void run() throws Exception {
-        check();
-        init();
-    }
-}

web/WEB-INF/tld/c-1_0-rt.tld

@@ -82,7 +82,7 @@
         to either the page, a String in 'var', or a Reader in 'varReader'.
     </description>
     <attribute>
-        <name>url</name>
+        <name>targetURL</name>
         <required>true</required>
         <rtexprvalue>true</rtexprvalue>
     </attribute>
@@ -281,7 +281,7 @@
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
-        <name>url</name>
+        <name>targetURL</name>
         <required>false</required>
         <rtexprvalue>true</rtexprvalue>
     </attribute>
@@ -346,7 +346,7 @@
   </tag>
 
   <tag>
-    <name>url</name>
+    <name>targetURL</name>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.UrlTag</tag-class>
     <body-content>JSP</body-content>
     <description>

web/WEB-INF/tld/c-1_0.tld

@@ -21,7 +21,7 @@
 	    out:default
 	    out:escapeXml
 	    if:test
-	    import:url
+	    import:targetURL
 	    import:context
 	    import:charEncoding
 	    forEach:items
@@ -36,12 +36,12 @@
 	    param:name
 	    param:value
             redirect:context
-            redirect:url
+            redirect:targetURL
 	    set:property
 	    set:target
 	    set:value
-	    url:context
-	    url:value
+	    targetURL:context
+	    targetURL:value
 	    when:test
 	</param-value>
 	<description>
@@ -139,7 +139,7 @@
 	to either the page, a String in 'var', or a Reader in 'varReader'.
     </description>
     <attribute>
-        <name>url</name>
+        <name>targetURL</name>
         <required>true</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
@@ -304,7 +304,7 @@
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
-        <name>url</name>
+        <name>targetURL</name>
         <required>true</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
@@ -369,7 +369,7 @@
   </tag>
 
   <tag>
-    <name>url</name>
+    <name>targetURL</name>
     <tag-class>org.apache.taglibs.standard.tag.el.core.UrlTag</tag-class>
     <body-content>JSP</body-content>
     <description>

web/WEB-INF/tld/c.tld

@@ -103,7 +103,7 @@ Scope for var.
         <description>
 The URL of the resource to import.
         </description>
-        <name>url</name>
+        <name>targetURL</name>
         <required>true</required>
         <rtexprvalue>true</rtexprvalue>
     </attribute>
@@ -403,7 +403,7 @@ Value of the parameter.
         <description>
 The URL of the resource to redirect to.
         </description>
-        <name>url</name>
+        <name>targetURL</name>
         <required>false</required>
         <rtexprvalue>true</rtexprvalue>
     </attribute>
@@ -500,13 +500,13 @@ Scope for var.
     <description>
         Creates a URL with optional query parameters.
     </description>
-    <name>url</name>
+    <name>targetURL</name>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.UrlTag</tag-class>
     <body-content>JSP</body-content>
     <attribute>
         <description>
 Name of the exported scoped variable for the
-processed url. The type of the scoped variable is
+processed targetURL. The type of the scoped variable is
 String.
         </description>
         <name>var</name>

web/WEB-INF/tld/sql-1_0-rt.tld

@@ -170,7 +170,7 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
-        <name>url</name>
+        <name>targetURL</name>
         <required>false</required>
         <rtexprvalue>true</rtexprvalue>
     </attribute>

web/WEB-INF/tld/sql-1_0.tld

@@ -30,7 +30,7 @@
         dateParam:type
         setDataSource:dataSource
         setDataSource:driver
-        setDataSource:url
+        setDataSource:targetURL
         setDataSource:user
         setDataSource:password
         </param-value>
@@ -195,7 +195,7 @@ ue.
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
-        <name>url</name>
+        <name>targetURL</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>

web/WEB-INF/tld/sql.tld

@@ -263,7 +263,7 @@ JDBC parameter: driver class name.
 JDBC parameter: URL associated with
 the database.
         </description>
-        <name>url</name>
+        <name>targetURL</name>
         <required>false</required>
         <rtexprvalue>true</rtexprvalue>
     </attribute>