From 28d6400be9d34a32bb888b01d4f2267ba50ba8ce Mon Sep 17 00:00:00 2001
From: Saisai Liu <1374434128@qq.com>
Date: Wed, 24 Apr 2024 19:32:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/muyu/etl/domain/TableInfo.java  | 11 ++++++-----
 .../muyu/etl/domain/resp/TableInfoStructureResp.java  |  1 +
 .../etl/service/impl/BasicConfigInfoServiceImpl.java  |  7 ++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java
index 763af63..df025be 100644
--- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java
+++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/TableInfo.java
@@ -2,14 +2,12 @@ package com.muyu.etl.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.TreeEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.web.domain.TreeEntity;
 
 /**
  * 库表基础信息对象 table_info
@@ -27,7 +25,7 @@ public class TableInfo extends TreeEntity
 
     /** 主键 */
 
-    
+
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
@@ -50,4 +48,7 @@ public class TableInfo extends TreeEntity
     private String center;
 
 
+    private Long parentId;
+
+
 }
diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java
index 96f9932..6c63dc1 100644
--- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java
+++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/TableInfoStructureResp.java
@@ -40,6 +40,7 @@ public class TableInfoStructureResp
     /** 表备注 */
     @Excel(name = "表备注")
     private String tableRemark;
+    private Long parentId;
 
     /** 数据量 */
     @Excel(name = "数据量")
diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java
index 288c3d3..b001272 100644
--- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java
+++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java
@@ -133,7 +133,7 @@ public class BasicConfigInfoServiceImpl  extends ServiceImpl<BasicConfigInfoMapp
             System.out.println("Connected to the MySQL server successfully.");
             //同步数据库信息
             //树级结构，库，表
-            TableInfo tableInfo = new TableInfo().builder()
+            TableInfo tableInfo = TableInfo.builder()
                 .basicId(basicConfigInfo.getId())
                 .parentId(0L)
                 .tableRemark("")
@@ -154,14 +154,14 @@ public class BasicConfigInfoServiceImpl  extends ServiceImpl<BasicConfigInfoMapp
                     String tableName1 = rs.getString("TABLE_NAME");
                     String tableRemark = rs.getString("REMARKS");
                     Connection finalConn = conn;
-                    PreparedStatement ps = conn.prepareStatement("select * from " + tableName1);
+                    PreparedStatement ps = conn.prepareStatement("select* from " + tableName1);
                     ResultSet rset = ps.executeQuery();
                     Long rowCount = 0L;
                     while(rset.next()) {rowCount++;}
                     TableInfo build = TableInfo.builder()
                             .basicId(basicConfigInfo.getId())
                             .tableName(tableName1)
-                            .tableRemark(tableRemark.isEmpty()? "":tableRemark)
+                            .tableRemark(tableRemark.isEmpty()? "null":tableRemark)
                             .parentId(tableInfo.getId())
                             .center("Y")
                             .updateBy(SecurityUtils.getUsername())
@@ -318,6 +318,7 @@ public class BasicConfigInfoServiceImpl  extends ServiceImpl<BasicConfigInfoMapp
                                 .center(info.getCenter())
                                 .tableRemark(info.getTableRemark())
                                 .dataNum(info.getDataNum())
+                                .parentId(info.getParentId())
                                 .databaseType(basicConfigInfo.getDatabaseType())
                                 .structureList(structureList)
                                 .basicId(info.getBasicId())