diff --git a/deployment/context.xml b/deployment/context.xml index 9e9d9af..70d970a 100644 --- a/deployment/context.xml +++ b/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"/> diff --git a/documents/GDMS_DB_Design .txt b/documents/GDMS_DB_Design .txt index 5cc8f24..af8b8f1 100644 --- a/documents/GDMS_DB_Design .txt +++ b/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 diff --git a/documents/数据库.txt b/documents/数据库.txt index 635fa76..37f6ce0 100644 --- a/documents/数据库.txt +++ b/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 diff --git a/src/core/operation/UploadFileOperation.java b/src/core/operation/UploadFile.java similarity index 95% rename from src/core/operation/UploadFileOperation.java rename to src/core/operation/UploadFile.java index ff26329..b75dcfa 100644 --- a/src/core/operation/UploadFileOperation.java +++ b/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 execute(User subject) throws Exception { File file = (File) this.getOptions().get("file"); diff --git a/src/core/operation/UploadFileOperation.json b/src/core/operation/UploadFile.json similarity index 100% rename from src/core/operation/UploadFileOperation.json rename to src/core/operation/UploadFile.json diff --git a/src/core/process/Process.java b/src/core/process/Process.java index a79f94f..5ef1c49 100644 --- a/src/core/process/Process.java +++ b/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; + } } diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index 7e9f354..ee0fae9 100644 --- a/src/core/process/ProcessManagement.java +++ b/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 status = getStatus(user); + public static Condition getCondition(User user) throws Exception { + Map status = getStatus(user); return getCondition(user,status); } - public static Condition getCondition(User user, Map status){ + public static Condition getCondition(User user, Map status){ Condition condition = new Condition(); - for(Map.Entry entry:status.entrySet()){ + for(Map.Entry 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 - public static Map getStatus(User user){ - + public static Map getStatus(User user) throws Exception { + Map status = new HashMap<>(); Map userTables = DBManagement.getUserStatusTables(user.getType()); String graduationDesignId = null; for(Map.Entry entry:userTables.entrySet()){ String[] ti = entry.getKey().split("."); String[] ts = entry.getValue().split("."); + List ls = new ArrayList<>(); + ls.add("id"); + Map limits = new HashMap<>(); + limits.put(ti[1],user.getId()); + List resultLs = DBManagement.select(ls,ti[0],limits,0,1); + if(resultLs.size()==0) continue; + graduationDesignId = resultLs.get(0)[0]; + 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 null; + return status; } public static Process getProcess(String process){ return null; diff --git a/src/error/GExcptInit.java b/src/error/GExcptInit.java new file mode 100644 index 0000000..ad1ec99 --- /dev/null +++ b/src/error/GExcptInit.java @@ -0,0 +1,7 @@ +package error; + +public class GExcptInit extends GExcpt { + public GExcptInit(String info) { + super(info); + } +} diff --git a/src/gdms/GDMS.java b/src/gdms/GDMS.java new file mode 100644 index 0000000..3a10322 --- /dev/null +++ b/src/gdms/GDMS.java @@ -0,0 +1,34 @@ +package gdms; + +import error.GExcptInit; + +import java.util.*; + +public class GDMS { + static Map schedules; + static String schedulePath = ""; + public static void init() throws GExcptInit { + initSchedule(); + Timer timer = new Timer(true); + for(Map.Entry 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() { + + } +} diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json new file mode 100644 index 0000000..66e7376 --- /dev/null +++ b/src/gdms/GlobalTimePoint.json @@ -0,0 +1,3 @@ +{ + "":"" +} \ No newline at end of file diff --git a/src/gdms/main.java b/src/gdms/main.java deleted file mode 100644 index a6931aa..0000000 --- a/src/gdms/main.java +++ /dev/null @@ -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(); - } -} diff --git a/web/WEB-INF/tld/c-1_0-rt.tld b/web/WEB-INF/tld/c-1_0-rt.tld index 2203657..3700a9e 100644 --- a/web/WEB-INF/tld/c-1_0-rt.tld +++ b/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'. - url + targetURL true true @@ -281,7 +281,7 @@ false - url + targetURL false true @@ -346,7 +346,7 @@ - url + targetURL org.apache.taglibs.standard.tag.rt.core.UrlTag JSP diff --git a/web/WEB-INF/tld/c-1_0.tld b/web/WEB-INF/tld/c-1_0.tld index ce80e8d..aea9d26 100644 --- a/web/WEB-INF/tld/c-1_0.tld +++ b/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 @@ -139,7 +139,7 @@ to either the page, a String in 'var', or a Reader in 'varReader'. - url + targetURL true false @@ -304,7 +304,7 @@ false - url + targetURL true false @@ -369,7 +369,7 @@ - url + targetURL org.apache.taglibs.standard.tag.el.core.UrlTag JSP diff --git a/web/WEB-INF/tld/c.tld b/web/WEB-INF/tld/c.tld index 22698c9..5ae8dd8 100644 --- a/web/WEB-INF/tld/c.tld +++ b/web/WEB-INF/tld/c.tld @@ -103,7 +103,7 @@ Scope for var. The URL of the resource to import. - url + targetURL true true @@ -403,7 +403,7 @@ Value of the parameter. The URL of the resource to redirect to. - url + targetURL false true @@ -500,13 +500,13 @@ Scope for var. Creates a URL with optional query parameters. - url + targetURL org.apache.taglibs.standard.tag.rt.core.UrlTag JSP 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. var diff --git a/web/WEB-INF/tld/sql-1_0-rt.tld b/web/WEB-INF/tld/sql-1_0-rt.tld index c2fe525..d1b895b 100644 --- a/web/WEB-INF/tld/sql-1_0-rt.tld +++ b/web/WEB-INF/tld/sql-1_0-rt.tld @@ -170,7 +170,7 @@ true - url + targetURL false true diff --git a/web/WEB-INF/tld/sql-1_0.tld b/web/WEB-INF/tld/sql-1_0.tld index 2f8a328..4cd3e3f 100644 --- a/web/WEB-INF/tld/sql-1_0.tld +++ b/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 @@ -195,7 +195,7 @@ ue. false - url + targetURL false false diff --git a/web/WEB-INF/tld/sql.tld b/web/WEB-INF/tld/sql.tld index e53445b..4f8e76b 100644 --- a/web/WEB-INF/tld/sql.tld +++ b/web/WEB-INF/tld/sql.tld @@ -263,7 +263,7 @@ JDBC parameter: driver class name. JDBC parameter: URL associated with the database. - url + targetURL false true