Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pre Merge pull request !407 from abbfun/N/A

Browse Source
This commit is contained in:
abbfun 2022-05-01 12:24:13 +00:00 committed by Gitee
commit 774a9f8803
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
View File

@ -44,6 +44,18 @@ public class GenConstants
public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
"bit", "bigint", "float", "double", "decimal" };
/** 数据库数字类型 */
public static final String[] COLUMNTYPE_NUMBER_BIT = { "bit" };
/** 数据库数字类型 */
public static final String[] COLUMNTYPE_NUMBER_INT = { "tinyint", "smallint", "mediumint", "int", "number", "integer" };
/** 数据库数字类型 */
public static final String[] COLUMNTYPE_NUMBER_LONG = { "bigint" };
/** 数据库数字类型 */
public static final String[] COLUMNTYPE_NUMBER_REAL = { "float", "double", "decimal" };
/** 页面不需要编辑字段 */
public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
@ -88,6 +100,9 @@ public class GenConstants
/** 富文本控件 */
public static final String HTML_EDITOR = "editor";
/** 布尔类型 */
public static final String TYPE_BOOLEAN = "Boolean";
/** 字符串类型 */
public static final String TYPE_STRING = "String";

37
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
View File

@ -56,26 +56,25 @@ public class GenUtils
column.setJavaType(GenConstants.TYPE_DATE);
column.setHtmlType(GenConstants.HTML_DATETIME);
}
else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType))
else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER_INT, dataType))
{
column.setHtmlType(GenConstants.HTML_INPUT);
// 如果是浮点型 统一用BigDecimal
String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
{
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
}
// 如果是整形
else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
{
column.setJavaType(GenConstants.TYPE_INTEGER);
}
// 长整形
else
{
column.setJavaType(GenConstants.TYPE_LONG);
}
column.setHtmlType(GenConstants.HTML_INPUT);
column.setJavaType(GenConstants.TYPE_INTEGER);
}
else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER_LONG, dataType))
{
column.setHtmlType(GenConstants.HTML_INPUT);
column.setJavaType(GenConstants.TYPE_LONG);
}
else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER_REAL, dataType))
{
column.setHtmlType(GenConstants.HTML_INPUT);
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
}
else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER_BIT, dataType))
{
column.setHtmlType(GenConstants.HTML_RADIO);
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
}
// 插入字段（默认所有字段都需要插入）