Skip to content

Commit 7c06d1e

Browse files
committed
support more data type and set default type to String
1 parent 20f5a65 commit 7c06d1e

6 files changed

Lines changed: 12 additions & 7 deletions

File tree

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ SpringBoot代码生成器。用于生成mybatis和jpa相关代码,基于xxl-co
1010
<tr><td>CSDN博客</td> <td>http://blog.csdn.net/moshowgame</td></tr>
1111
<tr><td></td> <td></td></tr>
1212
<tr><td>更新日期</td> <td>更新内容</td></tr>
13+
<tr><td>20180916<td>补充char/clob/blob/json等类型,如果类型未知,默认为String。</td></tr>
1314
<tr><td>20180915<td>新增Swagger-UI模板。修复一些命名和导入问题。JPA的Entity默认第一个字段为Id,如果不是请手工修改。</td></tr>
1415
<tr><td>20180913<td>修复字段没有描述以及类型为DATE型导致的问题。新增JPA的Controller模板。</td></tr>
1516
<tr><td>20180831<td>初始化项目。新增JPA系列Entity+Repository模板。</td></tr>
1617
</tbody></table>
17-
18-
<img src="https://img-blog.csdn.net/20180915223341689?watermark/2/text/aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L21vc2hvd2dhbWU=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70">
19-
<img src="https://img-blog.csdn.net/20180915223350756?watermark/2/text/aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L21vc2hvd2dhbWU=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70">
20-
<img src="https://img-blog.csdn.net/20180915223404593?watermark/2/text/aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L21vc2hvd2dhbWU=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70">
21-
<img src="https://img-blog.csdn.net/20180915223414219?watermark/2/text/aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L21vc2hvd2dhbWU=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70">
18+
<img src="./codegenerator1.png">
19+
<img src="./codegenerator2.png">
20+
<img src="./codegenerator3.png">
21+
<img src="./codegenerator4.png">
2222
<table>

codegenerator1.png

44.7 KB
Loading

codegenerator2.png

27.8 KB
Loading

codegenerator3.png

14.4 KB
Loading

codegenerator4.png

24.6 KB
Loading

generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
/**
1717
* @author xuxueli 2018-05-02 21:10:45
18+
* @modify zhengk/moshow 20180913
1819
*/
1920
public class TableParseUtil {
2021

@@ -106,6 +107,7 @@ public static ClassInfo processTableIntoClassInfo(String tableSql) throws IOExce
106107
// field class
107108
columnLine = columnLine.substring(columnLine.indexOf("`")+1).trim(); // int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
108109
String fieldClass = Object.class.getSimpleName();
110+
//2018-9-16 zhengk 补充char/clob/blob/json等类型,如果类型未知,默认为String
109111
if (columnLine.startsWith("int") || columnLine.startsWith("tinyint") || columnLine.startsWith("smallint")) {
110112
fieldClass = Integer.TYPE.getSimpleName();
111113
} else if (columnLine.startsWith("bigint")) {
@@ -116,10 +118,13 @@ public static ClassInfo processTableIntoClassInfo(String tableSql) throws IOExce
116118
fieldClass = Double.TYPE.getSimpleName();
117119
} else if (columnLine.startsWith("datetime") || columnLine.startsWith("timestamp")) {
118120
fieldClass = Date.class.getSimpleName();
119-
} else if (columnLine.startsWith("varchar") || columnLine.startsWith("text")) {
121+
} else if (columnLine.startsWith("varchar") || columnLine.startsWith("text")|| columnLine.startsWith("char")
122+
|| columnLine.startsWith("clob")||columnLine.startsWith("blob")||columnLine.startsWith("json")) {
120123
fieldClass = String.class.getSimpleName();
121-
} else if (columnLine.startsWith("decimal")) {
124+
} else if (columnLine.startsWith("decimal")||columnLine.startsWith("number")) {
122125
fieldClass = BigDecimal.class.getSimpleName();
126+
} else {
127+
fieldClass = String.class.getSimpleName();
123128
}
124129

125130
// field comment

0 commit comments

Comments
 (0)