Skip to content

修复mysql8.0.19版本代码生成无法识别数据类型的bug #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GoRoad wants to merge 4 commits into
base: master
Choose a base branch
from
Open

修复mysql8.0.19版本代码生成无法识别数据类型的bug #12

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc806cd
修复mysql8.0.19版本代码生成无法识别数据类型的bug
GoRoad Jul 17, 2020
971f58f
Merge pull request #1 from GoRoad/fix-gen
GoRoad Jul 17, 2020
7af6860
:bug: 修改注释
GoRoad Jul 17, 2020
0fbc17e
:bug: 修复使用mysql8.0.19版本后无法部分数据类型无法正确生成的问题
GoRoad Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ public static void initTable(GenTable genTable, String operName)
public static void initColumnField(GenTableColumn column, GenTable table)
{
String dataType = getDbType(column.getColumnType());
//mysql 8.0 使用unsigned等关键字修饰 需要去除 否则代码生成会无法识别类型
if (dataType.contains(" ")) {
dataType = dataType.substring(0, dataType.indexOf(" "));
}
String columnName = column.getColumnName();
column.setTableId(table.getTableId());
column.setCreateBy(table.getCreateBy());
Expand Down Expand Up @@ -64,8 +68,9 @@ else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType))
{
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
}
// 如果是整形
else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
// 如果是整形
//mysql8.0.17版本后TINYINT, SMALLINT, MEDIUMINT, INT, and BIGINT类型的显示宽度失效，因此通过字段宽度判断int/Long类型将不准确
else if((str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)|| (str == null &&dataType.equals("int")))
{
column.setJavaType(GenConstants.TYPE_INTEGER);
}
Expand Down Expand Up @@ -195,7 +200,7 @@ public static String replaceFirst(String replacementm, String[] searchList)
/**
* 关键字替换
*
* @param name 需要被替换的名字
* @param text 需要被替换的关键字
* @return 替换后的名字
*/
public static String replaceText(String text)
Expand Down Expand Up @@ -239,4 +244,4 @@ public static Integer getColumnLength(String columnType)
return 0;
}
}
}
}