diff --git a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DataSourceServiceImpl.java b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DataSourceServiceImpl.java index 57dbd8d..2c5c572 100644 --- a/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DataSourceServiceImpl.java +++ b/muyu-modules/muyu-etl/src/main/java/com/muyu/etl/service/impl/DataSourceServiceImpl.java @@ -53,33 +53,6 @@ public class DataSourceServiceImpl implements DataSourceService{ @Override public List selectDataSourceList(DataSource dataSource) { List dataSources = dataSourceMapper.selectDataSourceList(dataSource); -// dataSources.stream() -// .map(source -> { -// String user = source.getUsername(); -// String password = source.getPassword(); -// String jdbcDriver = "com.mysql.cj.jdbc.Driver"; -// String jdbcUrl = "jdbc:mysql://"+source.getLinkAddress()+":"+source.getPort()+"/"+source.getDatabaseName(); -// Connection conn = null; -// Result result = this.test(source); -// if (result.getCode()==200){ -// try { -// Class.forName(jdbcDriver); -// conn = DriverManager.getConnection(jdbcUrl, user, password); -// List tableNames = new ArrayList<>(); -// String sql="SELECT table_name FROM information_schema.tables WHERE table_schema = '"+source.getDatabaseName()+"'"; -// PreparedStatement ps = conn.prepareStatement(sql); -// ResultSet resultSet = ps.executeQuery(); -// while (resultSet.next()){ -// tableNames.add(resultSet.getString("table_name")); -// } -// source.setTableList(tableNames); -// ps.close(); -// } catch (ClassNotFoundException | SQLException e) { -// throw new RuntimeException(e); -// } -// } -// return null; -// }).toList(); return dataSources; } @@ -227,6 +200,8 @@ public class DataSourceServiceImpl implements DataSourceService{ case "blob": case "longblob": return "byte[]"; + case "longtext": + return "Clob"; // ... 其他类型映射,包括日期、时间、字符串、二进制、Blob、枚举、集合等 default: throw new IllegalArgumentException("Unsupported data type: " + mappingType); @@ -262,7 +237,6 @@ public class DataSourceServiceImpl implements DataSourceService{ ResultSet resultSet = preparedStatement.executeQuery(); // 遍历查询结果,创建并填充资产模型列表 while (resultSet.next()){ - AssetModel assetModel = new AssetModel(); assetModel.setComment(resultSet.getString("COLUMN_COMMENT")); diff --git a/muyu-modules/muyu-etl/src/main/resources/mapper/AssetModelMapper.xml b/muyu-modules/muyu-etl/src/main/resources/mapper/AssetModelMapper.xml index 1391a22..28d8a70 100644 --- a/muyu-modules/muyu-etl/src/main/resources/mapper/AssetModelMapper.xml +++ b/muyu-modules/muyu-etl/src/main/resources/mapper/AssetModelMapper.xml @@ -130,25 +130,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - insert into `asset_model_copy1` ( - `data_asset_id`, - `name`, - comment, - is_primary_key, - `type`, - mapping_type, - `length`, - decimal_places, - is_null, - is_dict, - default_value, - dict_key, - create_by, - create_time - ) values + INSERT INTO `asset_model_copy1` ( + `data_asset_id`, `name`, `comment`, `is_primary_key`, `type`, `mapping_type`, + `length`, `decimal_places`, `is_null`, `is_dict`, `default_value`, `dict_key`, + `create_by`, `create_time` + ) VALUES ( #{item.dataAssetId},