Skip to content

#319 fix: 生成Mapper文件jdbcType错误 #320

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#319 fix: 生成Mapper文件jdbcType错误 #320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 11 additions & 2 deletions src/main/java/com/zzg/mybatis/generator/util/DbUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@
import com.zzg.mybatis.generator.view.AlertUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.mybatis.generator.api.IntrospectedColumn;
import org.mybatis.generator.api.JavaTypeResolver;
import org.mybatis.generator.internal.types.JavaTypeResolverDefaultImpl;
import org.mybatis.generator.internal.util.ClassloaderUtility;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.sql.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;

/**
Expand All @@ -34,6 +36,8 @@ public class DbUtil {
private static volatile boolean portForwaring = false;
private static Map<Integer, Session> portForwardingSession = new ConcurrentHashMap<>();

private static final JavaTypeResolver JAVA_TYPE_RESOLVER = new JavaTypeResolverDefaultImpl();

public static Session getSSHSession(DatabaseConfig databaseConfig) {
if (StringUtils.isBlank(databaseConfig.getSshHost())
|| StringUtils.isBlank(databaseConfig.getSshPort())
Expand Down Expand Up @@ -192,9 +196,14 @@ public static List<UITableColumnVO> getTableColumns(DatabaseConfig dbConfig, Str
List<UITableColumnVO> columns = new ArrayList<>();
while (rs.next()) {
UITableColumnVO columnVO = new UITableColumnVO();
// 获取实际的JdbcType，针对类似于BIGINT UNSIGNED数据类型生成的mapper中jdbcType错误的问题
IntrospectedColumn introspectedColumn = new IntrospectedColumn();
introspectedColumn.setJdbcType(rs.getInt("DATA_TYPE"));
String jdbcType = JAVA_TYPE_RESOLVER.calculateJdbcTypeName(introspectedColumn);

String columnName = rs.getString("COLUMN_NAME");
columnVO.setColumnName(columnName);
columnVO.setJdbcType(rs.getString("TYPE_NAME"));
columnVO.setJdbcType(jdbcType);
columns.add(columnVO);
}
return columns;
Expand Down