From ea1e9ecb51d27edab5b3b33e0f66a91f28e3d104 Mon Sep 17 00:00:00 2001 From: wangbing Date: Thu, 23 Apr 2020 00:51:31 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 942e0434072b99cc5cb55502497aaa5c665c490a --- .../dbtool/javafx/manger/ProjectManager.java | 1 - .../dbtool/javafx/manger/XmlManager.java | 6 ---- .../manger/callable/SpringBootCallable.java | 28 +++++++++---------- .../xyz/wbsite/dbtool/javafx/po/Module.java | 9 ------ .../java/module/mgr/managerImpl.ftl | 4 +-- .../java/module/req/deleteRequestClass.ftl | 2 +- .../java/module/rsp/createResponseClass.ftl | 2 +- .../SpringBoot/resources/dbtool/table.ftl | 4 +-- .../SpringBoot/resources/dbtool/tableAll.ftl | 4 +-- .../modules/SpringBoot/test/test.ftl | 2 +- 10 files changed, 22 insertions(+), 40 deletions(-) diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java index f214f97b..0bd2b963 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java @@ -123,7 +123,6 @@ public class ProjectManager { table.setFind(true); table.setGet(true); table.setSearch(false); - table.setSys(md.isHasSysFields());//获取是否默认添加系统字段 checkSysFields(table);// 检查或移除系统字段 md.putTable(table); return table; diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java index 40bdce28..761f7b68 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java @@ -99,11 +99,6 @@ public class XmlManager { module.setModulePrefix(modulePrefix.item(0).getTextContent()); } - NodeList hasSysFields = moduleElement.getElementsByTagName("hasSysFields"); - if (hasSysFields.getLength() == 1) { - module.setHasSysFields(getBoolean(hasSysFields.item(0).getTextContent())); - } - NodeList tables = moduleElement.getElementsByTagName("table"); if (tables.getLength() > 0) { for (int j = 0; j < tables.getLength(); j++) { @@ -210,7 +205,6 @@ public class XmlManager { moduleName.setTextContent(md.getModuleName()); moduleComment.setTextContent(md.getModuleComment()); modulePrefix.setTextContent(md.getModulePrefix()); - hasSysFields.setTextContent(String.valueOf(md.isHasSysFields())); module.appendChild(moduleComment); module.appendChild(modulePrefix); module.appendChild(moduleName); 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 c61b4a20..a5d78226 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 @@ -809,21 +809,19 @@ public class SpringBootCallable implements Callable { } for (Module mo : project.getModules()) { - if (mo.isHasSysFields()) {//标准模型才好生成简单的htm - for (Table table : mo.getTables()) { - if (table.getHtml()) { - File module = Tool.createPath(screen.getAbsolutePath(), mo.getModuleName()); - HashMap ctx = new HashMap(); - ctx.put("basePackage", project.getProjectBasePackage()); - ctx.put("tool", Tool.class); - ctx.put("author", project.getProjectAuthor()); - ctx.put("date", new Date()); - ctx.put("table", table); - ctx.put("module", module.getName()); - ctx.put("fields", table.getFields()); - File file = Tool.createFile(module.getAbsolutePath(), table.getFName() + ".ftl"); - freeMarkerManager.outputTemp(file, "SpringBoot/resources/templates/screen/module/mgr.ftl", ctx); - } + for (Table table : mo.getTables()) { + if (table.getHtml()) { + File module = Tool.createPath(screen.getAbsolutePath(), mo.getModuleName()); + HashMap ctx = new HashMap(); + ctx.put("basePackage", project.getProjectBasePackage()); + ctx.put("tool", Tool.class); + ctx.put("author", project.getProjectAuthor()); + ctx.put("date", new Date()); + ctx.put("table", table); + ctx.put("module", module.getName()); + ctx.put("fields", table.getFields()); + File file = Tool.createFile(module.getAbsolutePath(), table.getFName() + ".ftl"); + freeMarkerManager.outputTemp(file, "SpringBoot/resources/templates/screen/module/mgr.ftl", ctx); } } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/Module.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/Module.java index f97cac03..2168d447 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/po/Module.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/Module.java @@ -31,19 +31,10 @@ public class Module extends TreeItem { private List tables = new ArrayList(); private String moduleName; - private boolean hasSysFields = true; private String projectName; private String projectBasePackage; private String projectAuthor; - public boolean isHasSysFields() { - return hasSysFields; - } - - public void setHasSysFields(boolean hasSysFields) { - this.hasSysFields = hasSysFields; - } - public String getModuleName() { return moduleName; } diff --git a/src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl b/src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl index ad36558b..af735b44 100644 --- a/src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl @@ -55,7 +55,7 @@ public class ${table.getCName()}ManagerImpl implements ${table.getCName()}Manage return response; } - <#if module.isHasSysFields()> + <#if table.sys> long id = IDgenerator.nextId(); ${table.getCName()} entity = MapperUtil.map(request, ${table.getCName()}.class); entity.setId(id); @@ -68,7 +68,7 @@ public class ${table.getCName()}ManagerImpl implements ${table.getCName()}Manage response.addError(ErrorType.BUSINESS_ERROR, Message.CREATE_FAILURE); return response; } - <#if module.isHasSysFields()> + <#if table.sys> response.setId(id); diff --git a/src/main/resources/modules/SpringBoot/java/module/req/deleteRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/deleteRequestClass.ftl index 86d9056c..1f9f7a95 100644 --- a/src/main/resources/modules/SpringBoot/java/module/req/deleteRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/deleteRequestClass.ftl @@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull; * @since ${date?string("yyyy-MM-dd")} */ public class ${table.getCName()}DeleteRequest extends BaseUpdateRequest { -<#if module.isHasSysFields()> +<#if table.sys> /** * 主键 diff --git a/src/main/resources/modules/SpringBoot/java/module/rsp/createResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/module/rsp/createResponseClass.ftl index ca007b03..45333db5 100644 --- a/src/main/resources/modules/SpringBoot/java/module/rsp/createResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/rsp/createResponseClass.ftl @@ -11,7 +11,7 @@ import ${basePackage}.frame.base.BaseResponse; */ public class ${table.getCName()}CreateResponse extends BaseResponse { - <#if module.isHasSysFields()> + <#if table.sys> /** * 主键 */ diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/table.ftl b/src/main/resources/modules/SpringBoot/resources/dbtool/table.ftl index b882d594..7fa8b6dd 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/table.ftl +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/table.ftl @@ -25,9 +25,9 @@ COMMENT ON COLUMN "${module.modulePrefix?default("")}${table.tableName}"."${fiel -- ---------------------------- CREATE TABLE `${module.modulePrefix?default("")}${table.tableName}` ( <#list table.fields as field> - ${dBmapper.getFieldSql(field)}<#if field_has_next||module.hasSysFields>, + ${dBmapper.getFieldSql(field)}<#if field_has_next||table.sys>, -<#if module.hasSysFields> +<#if table.sys> PRIMARY KEY (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='${table.tableComment?default("")}'; diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/tableAll.ftl b/src/main/resources/modules/SpringBoot/resources/dbtool/tableAll.ftl index da0f01f1..efcd073c 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/tableAll.ftl +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/tableAll.ftl @@ -28,9 +28,9 @@ COMMENT ON COLUMN "${module.modulePrefix?default("")}${table.tableName}"."${fiel -- ---------------------------- CREATE TABLE `${module.modulePrefix?default("")}${table.tableName}` ( <#list table.fields as field> - ${dBmapper.getFieldSql(field)}<#if field_has_next||module.hasSysFields>, + ${dBmapper.getFieldSql(field)}<#if field_has_next||table.sys>, -<#if module.hasSysFields> +<#if table.sys> PRIMARY KEY (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='${table.tableComment?default("")}'; diff --git a/src/main/resources/modules/SpringBoot/test/test.ftl b/src/main/resources/modules/SpringBoot/test/test.ftl index 3dfc4fe1..95d2ee04 100644 --- a/src/main/resources/modules/SpringBoot/test/test.ftl +++ b/src/main/resources/modules/SpringBoot/test/test.ftl @@ -72,7 +72,7 @@ public class ${table.getCName()}Test { ${table.getCName()}CreateResponse createResponse = ${table.getFName()}Manager.create(createRequest,token); -<#if module.isHasSysFields()> +<#if table.sys> assertTrue(!createResponse.hasError() && createResponse.getId() > 0); <#else> assertTrue(!createResponse.hasError());