From eaf8ba8a83a2e931285bac8fdd195c5500de8681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Tue, 10 Sep 2024 17:40:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=BE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/muyu/mysql/MySqlDataSource.java  | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java b/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java
index d507e9d..2079117 100644
--- a/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java
+++ b/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java
@@ -387,7 +387,7 @@ public class MySqlDataSource extends BaseDataAbsSource {
             int c = 0;
             while (resultSet.next()){
                 for (int i = 1; i <= columnCount; i++) {
-
+                    log.info("反复循环的次数为：{}",i);
                     if (resultSet.isFirst()){
                         String columnTypeName = metaData.getColumnTypeName(i);
                         DatabaseMetaData metaDataColumns = conn.getMetaData();
@@ -397,16 +397,32 @@ public class MySqlDataSource extends BaseDataAbsSource {
 
                         while (columns.next()){
                             remarks = columns.getString("REMARKS");
-
                             log.info("字段备注:"+remarks);
                         }
+                        log.info("字段备注提取完成");
+                        Class clazz = DataType.convertType(columnTypeName);
+                        log.info("字段类型：{}", clazz.getName());
+                        Object object = resultSet.getObject(i, clazz);
+                        log.info("字段类型：{}", object);
+                        String key = metaData.getColumnName(i);
+                        log.info("字段Key：{}", key);
+                        log.info("columnTypeName{},",columnTypeName);
+                        DataType bySqlType = DataType.findBySqlType(columnTypeName);
+                        log.info("字段数据类型：{}", bySqlType);
                         DataValue build = DataValue.builder()
-                                .key(metaData.getColumnName(i))
+                                .key(key)
                                 .label(remarks)
-                                .value(resultSet.getObject(i, DataType.convertType(columnTypeName)))
-                                .type(DataType.findBySqlType(columnTypeName))
+                                .value(object)
+                                .type(bySqlType)
                                 .build();
+                        DataValue dataValue = new DataValue();
+                        dataValue.setKey(key);
+                        dataValue.setValue(object);
+                        dataValue.setType(bySqlType);
+                        dataValue.setLabel(remarks);
+                        log.info("Map插入内容：{}-{}-{}", i,build,dataValue);
                         map.put(i,build);
+                        log.info("插入内容：{}-{}", c, i);
                         dataValues[c][i-1]=build;
                     }else {
                         DataValue build = DataValue.builder()
@@ -415,18 +431,19 @@ public class MySqlDataSource extends BaseDataAbsSource {
                                 .value(resultSet.getObject(i, map.get(i).getType().getTargetType()))
                                 .type(map.get(i).getType())
                                 .build();
+                        log.info("插入内容：{}-{}", c, i);
                         dataValues[c][i-1]=build;
-
                     }
-                    log.info("反复循环的次数为：{}",i);
                 }
                 c++;
                 log.info("askldkjjjsk查询完毕啊{}",c);
             }
             log.info("askldk查询完毕");
-        } catch (SQLException e) {
+        } catch (Throwable e) {
+            log.error("执行发生异常：{}", e.getMessage(), e);
             throw new RuntimeException(e);
         }finally {
+            log.info("关闭连接池");
             close(hikariDataSource); // 关闭数据源
         }
         log.info("拿到的值aaaa为{}",dataValues.length);