diff --git a/README.md b/README.md index daa08e4..18a733d 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ SpringBoot代码生成器。用于生成mybatis和jpa相关代码,基于xxl-co CSDN博客 http://blog.csdn.net/moshowgame 更新日期 更新内容 +20180916补充char/clob/blob/json等类型,如果类型未知,默认为String。 20180915新增Swagger-UI模板。修复一些命名和导入问题。JPA的Entity默认第一个字段为Id,如果不是请手工修改。 20180913修复字段没有描述以及类型为DATE型导致的问题。新增JPA的Controller模板。 20180831初始化项目。新增JPA系列Entity+Repository模板。 - - - - - + + + + \ No newline at end of file diff --git a/codegenerator1.png b/codegenerator1.png new file mode 100644 index 0000000..502da59 Binary files /dev/null and b/codegenerator1.png differ diff --git a/codegenerator2.png b/codegenerator2.png new file mode 100644 index 0000000..0d2e524 Binary files /dev/null and b/codegenerator2.png differ diff --git a/codegenerator3.png b/codegenerator3.png new file mode 100644 index 0000000..2466d09 Binary files /dev/null and b/codegenerator3.png differ diff --git a/codegenerator4.png b/codegenerator4.png new file mode 100644 index 0000000..1e8e29f Binary files /dev/null and b/codegenerator4.png differ diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java index abd56c9..43952de 100644 --- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java +++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java @@ -15,6 +15,7 @@ import java.util.regex.Pattern; /** * @author xuxueli 2018-05-02 21:10:45 + * @modify zhengk/moshow 20180913 */ public class TableParseUtil { @@ -106,6 +107,7 @@ public class TableParseUtil { // field class columnLine = columnLine.substring(columnLine.indexOf("`")+1).trim(); // int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID', String fieldClass = Object.class.getSimpleName(); + //2018-9-16 zhengk 补充char/clob/blob/json等类型,如果类型未知,默认为String if (columnLine.startsWith("int") || columnLine.startsWith("tinyint") || columnLine.startsWith("smallint")) { fieldClass = Integer.TYPE.getSimpleName(); } else if (columnLine.startsWith("bigint")) { @@ -116,10 +118,13 @@ public class TableParseUtil { fieldClass = Double.TYPE.getSimpleName(); } else if (columnLine.startsWith("datetime") || columnLine.startsWith("timestamp")) { fieldClass = Date.class.getSimpleName(); - } else if (columnLine.startsWith("varchar") || columnLine.startsWith("text")) { + } else if (columnLine.startsWith("varchar") || columnLine.startsWith("text")|| columnLine.startsWith("char") + || columnLine.startsWith("clob")||columnLine.startsWith("blob")||columnLine.startsWith("json")) { fieldClass = String.class.getSimpleName(); - } else if (columnLine.startsWith("decimal")) { + } else if (columnLine.startsWith("decimal")||columnLine.startsWith("number")) { fieldClass = BigDecimal.class.getSimpleName(); + } else { + fieldClass = String.class.getSimpleName(); } // field comment