From 639cb8159ea2b9a09ddfca7ac78b17ebaff2e639 Mon Sep 17 00:00:00 2001
From: Jiang Peng <2622360564@qq.com>
Date: Fri, 26 Apr 2024 09:29:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=BA=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=85=A5=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataSourceServiceImpl.java   | 30 ++-----------------
 .../resources/mapper/AssetModelMapper.xml     | 23 ++++----------
 2 files changed, 8 insertions(+), 45 deletions(-)

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<DataSource> selectDataSourceList(DataSource dataSource) {
         List<DataSource> 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<TableDetail> 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"
 <!--                <if test="item.createTime != null">#{item.createTime},</if>-->
 <!--            </trim>-->
 <!--        </foreach>-->
-<!--    </insert>-->
 
+<!--    </insert>-->
     <insert id="batchInsert" parameterType="com.muyu.etl.domain.AssetModel" useGeneratedKeys="true" keyProperty="id">
-        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
         <foreach collection="tableAssets" item="item" separator=",">
             (
             #{item.dataAssetId},