diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java index 125b8bda..2a6ae34c 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java @@ -294,7 +294,7 @@ public class SpringBootCallable implements Callable { ctx.put("author", md.getProjectAuthor()); ctx.put("date", new Date()); - File file = Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + ".java"); + File file = Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + ".java"); freeMarkerManager.outputTemp(file, "SpringBoot/java/module/ent/entity.ftl", ctx); } } @@ -323,12 +323,12 @@ public class SpringBootCallable implements Callable { for (Table table : md.getTables()) { ctx.put("table", table); - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".java"), "SpringBoot/java/module/mpr/mapper.java", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), "SpringBoot/java/module/mpr/mapper.java", ctx); if (table.getSys()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_mapper.xml", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_mapper.xml", ctx); } else { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_NSYS_mapper.xml", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_NSYS_mapper.xml", ctx); } } } @@ -350,8 +350,8 @@ public class SpringBootCallable implements Callable { for (Table table : md.getTables()) { ctx.put("table", table); - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Manager" + ".java"), "SpringBoot/java/module/mgr/manager.ftl", ctx); - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBoot/java/module/mgr/managerImpl.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Manager" + ".java"), "SpringBoot/java/module/mgr/manager.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBoot/java/module/mgr/managerImpl.ftl", ctx); } } @@ -384,27 +384,27 @@ public class SpringBootCallable implements Callable { ctx.put("table", table); if (table.getCreate()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "CreateRequest" + ".java"), "SpringBoot/java/module/req/createRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "CreateRequest" + ".java"), "SpringBoot/java/module/req/createRequestClass.ftl", ctx); } if (table.getDelete()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "DeleteRequest" + ".java"), "SpringBoot/java/module/req/deleteRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "DeleteRequest" + ".java"), "SpringBoot/java/module/req/deleteRequestClass.ftl", ctx); } if (table.getUpdate()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "UpdateRequest" + ".java"), "SpringBoot/java/module/req/updateRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "UpdateRequest" + ".java"), "SpringBoot/java/module/req/updateRequestClass.ftl", ctx); } if (table.getFind()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "FindRequest" + ".java"), "SpringBoot/java/module/req/findRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "FindRequest" + ".java"), "SpringBoot/java/module/req/findRequestClass.ftl", ctx); } if (table.getGet()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetRequest" + ".java"), "SpringBoot/java/module/req/getRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "GetRequest" + ".java"), "SpringBoot/java/module/req/getRequestClass.ftl", ctx); } if (table.getSearch()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "SearchRequest" + ".java"), "SpringBoot/java/module/req/searchRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "SearchRequest" + ".java"), "SpringBoot/java/module/req/searchRequestClass.ftl", ctx); } } } @@ -438,27 +438,27 @@ public class SpringBootCallable implements Callable { ctx.put("table", table); if (table.getCreate()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "CreateResponse" + ".java"), "SpringBoot/java/module/rsp/createResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "CreateResponse" + ".java"), "SpringBoot/java/module/rsp/createResponseClass.ftl", ctx); } if (table.getDelete()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "DeleteResponse" + ".java"), "SpringBoot/java/module/rsp/deleteResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "DeleteResponse" + ".java"), "SpringBoot/java/module/rsp/deleteResponseClass.ftl", ctx); } if (table.getUpdate()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "UpdateResponse" + ".java"), "SpringBoot/java/module/rsp/updateResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "UpdateResponse" + ".java"), "SpringBoot/java/module/rsp/updateResponseClass.ftl", ctx); } if (table.getFind()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "FindResponse" + ".java"), "SpringBoot/java/module/rsp/findResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "FindResponse" + ".java"), "SpringBoot/java/module/rsp/findResponseClass.ftl", ctx); } if (table.getGet()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetResponse" + ".java"), "SpringBoot/java/module/rsp/getResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "GetResponse" + ".java"), "SpringBoot/java/module/rsp/getResponseClass.ftl", ctx); } if (table.getSearch()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "SearchResponse" + ".java"), "SpringBoot/java/module/rsp/searchResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "SearchResponse" + ".java"), "SpringBoot/java/module/rsp/searchResponseClass.ftl", ctx); } } } @@ -875,7 +875,7 @@ public class SpringBootCallable implements Callable { ctx.put("author", md.getProjectAuthor()); ctx.put("date", new Date()); - File file = Tool.createFile(module.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Test" + ".java"); + File file = Tool.createFile(module.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Test" + ".java"); freeMarkerManager.outputTemp(file, "SpringBoot/test/test.ftl", ctx); } } @@ -901,6 +901,7 @@ public class SpringBootCallable implements Callable { ctx.put("moduleName", project.getProjectName()); ctx.put("author", project.getProjectAuthor()); ctx.put("date", new Date()); + ctx.put("project", project); File system = Tool.createPath(root.getAbsolutePath(), "datainit"); for (String apiFile : ResourceUtil.getResourceFiles("/modules/SpringBoot/test/datainit/")) { diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootServiceCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootServiceCallable.java index 1bc1f147..baecd513 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootServiceCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootServiceCallable.java @@ -196,7 +196,7 @@ public class SpringBootServiceCallable implements Callable { ctx.put("author", md.getProjectAuthor()); ctx.put("date", new Date()); - File file = Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + ".java"); + File file = Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + ".java"); freeMarkerManager.outputTemp(file, "SpringBootService/java/module/ent/entity.ftl", ctx); } } @@ -225,12 +225,12 @@ public class SpringBootServiceCallable implements Callable { for (Table table : md.getTables()) { ctx.put("table", table); - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".java"), "SpringBootService/java/module/mpr/mapper.java", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), "SpringBootService/java/module/mpr/mapper.java", ctx); if (table.getSys()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".xml"), "SpringBootService/java/module/mpr/" + project.getDatabase().name() + "_mapper.xml", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBootService/java/module/mpr/" + project.getDatabase().name() + "_mapper.xml", ctx); } else { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".xml"), "SpringBootService/java/module/mpr/" + project.getDatabase().name() + "_NSYS_mapper.xml", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBootService/java/module/mpr/" + project.getDatabase().name() + "_NSYS_mapper.xml", ctx); } } } @@ -252,8 +252,8 @@ public class SpringBootServiceCallable implements Callable { for (Table table : md.getTables()) { ctx.put("table", table); - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Manager" + ".java"), "SpringBootService/java/module/mgr/manager.ftl", ctx); - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBootService/java/module/mgr/managerImpl.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Manager" + ".java"), "SpringBootService/java/module/mgr/manager.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBootService/java/module/mgr/managerImpl.ftl", ctx); } } @@ -286,27 +286,27 @@ public class SpringBootServiceCallable implements Callable { ctx.put("table", table); if (table.getCreate()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "CreateRequest" + ".java"), "SpringBootService/java/module/req/createRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "CreateRequest" + ".java"), "SpringBootService/java/module/req/createRequestClass.ftl", ctx); } if (table.getDelete()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "DeleteRequest" + ".java"), "SpringBootService/java/module/req/deleteRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "DeleteRequest" + ".java"), "SpringBootService/java/module/req/deleteRequestClass.ftl", ctx); } if (table.getUpdate()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "UpdateRequest" + ".java"), "SpringBootService/java/module/req/updateRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "UpdateRequest" + ".java"), "SpringBootService/java/module/req/updateRequestClass.ftl", ctx); } if (table.getFind()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "FindRequest" + ".java"), "SpringBootService/java/module/req/findRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "FindRequest" + ".java"), "SpringBootService/java/module/req/findRequestClass.ftl", ctx); } if (table.getGet()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetRequest" + ".java"), "SpringBootService/java/module/req/getRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "GetRequest" + ".java"), "SpringBootService/java/module/req/getRequestClass.ftl", ctx); } if (table.getSearch()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "SearchRequest" + ".java"), "SpringBootService/java/module/req/searchRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "SearchRequest" + ".java"), "SpringBootService/java/module/req/searchRequestClass.ftl", ctx); } } } @@ -340,27 +340,27 @@ public class SpringBootServiceCallable implements Callable { ctx.put("table", table); if (table.getCreate()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "CreateResponse" + ".java"), "SpringBootService/java/module/rsp/createResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "CreateResponse" + ".java"), "SpringBootService/java/module/rsp/createResponseClass.ftl", ctx); } if (table.getDelete()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "DeleteResponse" + ".java"), "SpringBootService/java/module/rsp/deleteResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "DeleteResponse" + ".java"), "SpringBootService/java/module/rsp/deleteResponseClass.ftl", ctx); } if (table.getUpdate()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "UpdateResponse" + ".java"), "SpringBootService/java/module/rsp/updateResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "UpdateResponse" + ".java"), "SpringBootService/java/module/rsp/updateResponseClass.ftl", ctx); } if (table.getFind()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "FindResponse" + ".java"), "SpringBootService/java/module/rsp/findResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "FindResponse" + ".java"), "SpringBootService/java/module/rsp/findResponseClass.ftl", ctx); } if (table.getGet()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetResponse" + ".java"), "SpringBootService/java/module/rsp/getResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "GetResponse" + ".java"), "SpringBootService/java/module/rsp/getResponseClass.ftl", ctx); } if (table.getSearch()) { - freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "SearchResponse" + ".java"), "SpringBootService/java/module/rsp/searchResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "SearchResponse" + ".java"), "SpringBootService/java/module/rsp/searchResponseClass.ftl", ctx); } } } @@ -623,7 +623,7 @@ public class SpringBootServiceCallable implements Callable { ctx.put("author", md.getProjectAuthor()); ctx.put("date", new Date()); - File file = Tool.createFile(module.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Test" + ".java"); + File file = Tool.createFile(module.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Test" + ".java"); freeMarkerManager.outputTemp(file, "SpringBootService/test/test.ftl", ctx); } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringMVCCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringMVCCallable.java index b9023609..cdf005cd 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringMVCCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringMVCCallable.java @@ -202,7 +202,7 @@ public class SpringMVCCallable implements Callable { ctx.put("author", project.getProjectAuthor()); ctx.put("date", new Date()); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + ".java"), option + "/java/ent/entity.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + ".java"), option + "/java/ent/entity.ftl", ctx); } catch (Exception e) { @@ -292,8 +292,8 @@ public class SpringMVCCallable implements Callable { try { ctx.put("table", table); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "Mapper" + ".java"), option + "/java/mpr/mapperJava.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "Mapper" + ".xml"), option + "/java/mpr/mapper.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), option + "/java/mpr/mapperJava.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), option + "/java/mpr/mapper.ftl", ctx); } catch (Exception e) { @@ -319,8 +319,8 @@ public class SpringMVCCallable implements Callable { for (Table table : project.getTables()) { ctx.put("table", table); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "Manager" + ".java"), option + "/java/mgr/manager.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "ManagerImpl" + ".java"), option + "/java/mgr/managerImpl.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "Manager" + ".java"), option + "/java/mgr/manager.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "ManagerImpl" + ".java"), option + "/java/mgr/managerImpl.ftl", ctx); } } catch (Exception e) { @@ -353,12 +353,12 @@ public class SpringMVCCallable implements Callable { for (Table table : project.getTables()) { ctx.put("table", table); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "CreateRequest" + ".java"), option + "/java/req/createRequestClass.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "DeleteRequest" + ".java"), option + "/java/req/deleteRequestClass.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "UpdateRequest" + ".java"), option + "/java/req/updateRequestClass.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "FindRequest" + ".java"), option + "/java/req/findRequestClass.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "SearchRequest" + ".java"), option + "/java/req/searchRequestClass.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "GetRequest" + ".java"), option + "/java/req/getRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "CreateRequest" + ".java"), option + "/java/req/createRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "DeleteRequest" + ".java"), option + "/java/req/deleteRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "UpdateRequest" + ".java"), option + "/java/req/updateRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "FindRequest" + ".java"), option + "/java/req/findRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "SearchRequest" + ".java"), option + "/java/req/searchRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "GetRequest" + ".java"), option + "/java/req/getRequestClass.ftl", ctx); } } catch (Exception e) { e.printStackTrace(); @@ -388,12 +388,12 @@ public class SpringMVCCallable implements Callable { for (Table table : project.getTables()) { ctx.put("table", table); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "CreateResponse" + ".java"), option + "/java/rsp/createResponseClass.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "DeleteResponse" + ".java"), option + "/java/rsp/deleteResponseClass.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "UpdateResponse" + ".java"), option + "/java/rsp/updateResponseClass.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "FindResponse" + ".java"), option + "/java/rsp/findResponseClass.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "SearchResponse" + ".java"), option + "/java/rsp/searchResponseClass.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getTableName()) + "GetResponse" + ".java"), option + "/java/rsp/getResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "CreateResponse" + ".java"), option + "/java/rsp/createResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "DeleteResponse" + ".java"), option + "/java/rsp/deleteResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "UpdateResponse" + ".java"), option + "/java/rsp/updateResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "FindResponse" + ".java"), option + "/java/rsp/findResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "SearchResponse" + ".java"), option + "/java/rsp/searchResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getTableName()) + "GetResponse" + ".java"), option + "/java/rsp/getResponseClass.ftl", ctx); } } catch (Exception e) { e.printStackTrace(); @@ -573,7 +573,7 @@ public class SpringMVCCallable implements Callable { ctx.put("date", new Date()); for (Module table : project.getModules()) { ctx.put("table", table); - freeMarkerManager.outputTemp(new File(module.getAbsolutePath() + File.separator + Tool.lineToClassName(table.getModuleName()) + "Test" + ".java"), option + "/test/test.ftl", ctx); + freeMarkerManager.outputTemp(new File(module.getAbsolutePath() + File.separator + Tool.ABB2Abb(table.getModuleName()) + "Test" + ".java"), option + "/test/test.ftl", ctx); } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java index f921dfa1..f3d7f77b 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java @@ -156,11 +156,11 @@ public class Field extends Table { } public String getterName() { - return "get" + Tool.lineToClassName(this.fieldName); + return "get" + Tool.ABB2Abb(this.fieldName); } public String setterName() { - return "set" + Tool.lineToClassName(this.fieldName); + return "set" + Tool.ABB2Abb(this.fieldName); } public Boolean getIsQuery() { @@ -232,6 +232,6 @@ public class Field extends Table { } public String getCName() { - return Tool.lineToClassName(this.fieldName); + return Tool.ABB2Abb(this.fieldName); } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java index 77d29ee1..dc706965 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java @@ -89,7 +89,7 @@ public class Table extends TreeItem { } public String getCName() { - return Tool.lineToClassName(this.tableName); + return Tool.ABB2Abb(this.tableName); } public String getFName() { diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java index e677eb87..2f55d03b 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Tool.java @@ -145,7 +145,7 @@ public class Tool { * @param param * @return */ - public static String lineToClassName(String param) { + public static String ABB2Abb(String param) { if (param == null || "".equals(param.trim())) { return ""; } diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/schedule.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/schedule.ftl new file mode 100644 index 00000000..92bb0f53 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/schedule.ftl @@ -0,0 +1,86 @@ +
+
+ + diff --git a/src/main/resources/modules/SpringBoot/test/datainit/RoleInit.java b/src/main/resources/modules/SpringBoot/test/datainit/RoleInit.java index 700082a8..f1f4b101 100644 --- a/src/main/resources/modules/SpringBoot/test/datainit/RoleInit.java +++ b/src/main/resources/modules/SpringBoot/test/datainit/RoleInit.java @@ -1,25 +1,25 @@ package ${basePackage}.datainit; - import org.junit.Test; - import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; - import org.springframework.boot.test.context.SpringBootTest; - import org.springframework.test.annotation.Rollback; - import org.springframework.test.context.junit4.SpringRunner; - import org.springframework.transaction.annotation.Transactional; - import ${basePackage}.frame.auth.Token; - import ${basePackage}.frame.utils.MapperUtil; - import ${basePackage}.module.system.mgr.ResManager; - import ${basePackage}.module.system.mgr.RoleManager; - import ${basePackage}.module.system.mgr.RoleResManager; - import ${basePackage}.module.system.req.ResCreateRequest; - import ${basePackage}.module.system.req.RoleCreateRequest; - import ${basePackage}.module.system.req.RoleResCheckRequest; - import ${basePackage}.module.system.rsp.ResCreateResponse; - import ${basePackage}.module.system.rsp.RoleCreateResponse; - import ${basePackage}.module.system.rsp.RoleResCheckResponse; - - import static org.junit.Assert.assertTrue; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.transaction.annotation.Transactional; +import ${basePackage}.frame.auth.Token; +import ${basePackage}.frame.utils.MapperUtil; +import ${basePackage}.module.system.mgr.ResManager; +import ${basePackage}.module.system.mgr.RoleManager; +import ${basePackage}.module.system.mgr.RoleResManager; +import ${basePackage}.module.system.req.ResCreateRequest; +import ${basePackage}.module.system.req.RoleCreateRequest; +import ${basePackage}.module.system.req.RoleResCheckRequest; +import ${basePackage}.module.system.rsp.ResCreateResponse; +import ${basePackage}.module.system.rsp.RoleCreateResponse; +import ${basePackage}.module.system.rsp.RoleResCheckResponse; + +import static org.junit.Assert.assertTrue; @RunWith(SpringRunner.class) @SpringBootTest @@ -124,6 +124,32 @@ public class RoleInit { createRes(roleId, roleCode, "WEB_TOKENS_EXPORT", "凭证导出", "异步请求", "/ajax/system/tokens/exports"); createRes(roleId, roleCode, "WEB_TOKENS_LOGOUT", "凭证注销", "异步请求", "/ajax/system/tokens/logout"); +<#list project.modules as module> + <#list module.tables as table> + <#if table.html> + createRes(roleId, roleCode, "WEB_${table.tableName}", "${table.tableComment}新增", "网页地址", "/system/${table.getCName()}.htm"); + + <#if table.create> + createRes(roleId, roleCode, "WEB_${table.tableName}_CREATE", "${table.tableComment}新增", "异步请求", "/ajax/system/${table.getCName()}/create"); + + <#if table.delete> + createRes(roleId, roleCode, "WEB_${table.tableName}_DELETE", "${table.tableComment}删除", "异步请求", "/ajax/system/${table.getCName()}/delete"); + + <#if table.update> + createRes(roleId, roleCode, "WEB_${table.tableName}_UPDATE", "${table.tableComment}更新", "异步请求", "/ajax/system/${table.getCName()}/update"); + + <#if table.find> + createRes(roleId, roleCode, "WEB_${table.tableName}_FIND", "${table.tableComment}查询", "异步请求", "/ajax/system/${table.getCName()}/find"); + + <#if table.get> + createRes(roleId, roleCode, "WEB_${table.tableName}_GET", "${table.tableComment}获取", "异步请求", "/ajax/system/${table.getCName()}/get"); + + <#if table.search> + createRes(roleId, roleCode, "WEB_${table.tableName}_SEARCH", "${table.tableComment}搜索", "异步请求", "/ajax/system/${table.getCName()}/search"); + + + + } }