From 9b939e87974517984d1ee36a757caad6a8c59ebf Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sun, 4 Aug 2024 00:33:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=B7=B2?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youlai/system/model/vo/TablePageVO.java   |  3 +++
 src/main/resources/mapper/DatabaseMapper.xml  | 22 ++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/youlai/system/model/vo/TablePageVO.java b/src/main/java/com/youlai/system/model/vo/TablePageVO.java
index c4e3b4d2..aff66e51 100644
--- a/src/main/java/com/youlai/system/model/vo/TablePageVO.java
+++ b/src/main/java/com/youlai/system/model/vo/TablePageVO.java
@@ -26,4 +26,7 @@ public class TablePageVO {
     @Schema(description = "创建时间",example = "2023-08-08 08:08:08")
     private String createTime;
 
+    @Schema(description="是否已配置")
+    private Integer isConfigured;
+
 }
diff --git a/src/main/resources/mapper/DatabaseMapper.xml b/src/main/resources/mapper/DatabaseMapper.xml
index 43c48698..abd0f345 100644
--- a/src/main/resources/mapper/DatabaseMapper.xml
+++ b/src/main/resources/mapper/DatabaseMapper.xml
@@ -7,22 +7,24 @@
     <!-- 查询数据库表分页 -->
     <select id="getTablePage" resultType="com.youlai.system.model.vo.TablePageVO">
         SELECT
-            TABLE_NAME ,
-            TABLE_COMMENT ,
-            TABLE_COLLATION,
-            ENGINE,
-            CREATE_TIME
+            t1.TABLE_NAME ,
+            t1.TABLE_COMMENT ,
+            t1.TABLE_COLLATION,
+            t1.ENGINE,
+            t1.CREATE_TIME,
+            CASE WHEN t2.id IS NOT NULL THEN 1 ELSE 0 END AS isConfigured
         FROM
-            information_schema.tables
+            information_schema.tables t1
+            LEFT JOIN gen_config t2 on t1.TABLE_NAME = t2.table_name
         WHERE
-            TABLE_SCHEMA = (SELECT DATABASE())
-            AND table_type = 'BASE TABLE'
+            t1.TABLE_SCHEMA = (SELECT DATABASE())
+            AND t1.table_type = 'BASE TABLE'
             <if test="queryParams.keywords != null and queryParams.keywords.trim() neq ''">
-                AND TABLE_NAME LIKE CONCAT('%',#{queryParams.keywords},'%')
+                AND t1.TABLE_NAME LIKE CONCAT('%',#{queryParams.keywords},'%')
             </if>
         <!-- 排除的表 -->
         <if test="queryParams.excludeTables != null and queryParams.excludeTables.size() > 0">
-            AND TABLE_NAME NOT IN
+            AND t1.TABLE_NAME NOT IN
             <foreach collection="queryParams.excludeTables" item="excludeTable" open="(" close=")" separator=",">
                 #{excludeTable}
             </foreach>