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

Pre Merge pull request !472 from 耿嘉祺/master

Browse Source
This commit is contained in:
耿嘉祺 2022-04-16 07:22:55 +00:00 committed by Gitee
commit 08a8da66f3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,8 +41,8 @@ public class GenConstants
public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
/** 数据库数字类型 */
public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
"bit", "bigint", "float", "double", "decimal" };
public static final String[] COLUMNTYPE_NUMBER = { "bigint", "bit", "tinyint", "smallint", "mediumint", "int", "integer",
"number", "numeric", "float", "double", "decimal" };
/** 页面不需要编辑字段 */
public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };

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

@ -1,6 +1,8 @@
package com.ruoyi.generator.util;
import java.util.Arrays;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.RegExUtils;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.utils.StringUtils;
@ -60,14 +62,13 @@ public class GenUtils
{
column.setHtmlType(GenConstants.HTML_INPUT);
int index = ArrayUtils.indexOf(GenConstants.COLUMNTYPE_NUMBER, dataType);
// 如果是浮点型 统一用BigDecimal
String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
{
if (index > 6) {
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
}
// 如果是整形
else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
else if (index > 0)
{
column.setJavaType(GenConstants.TYPE_INTEGER);
}