From 846a547254e42043e76b394e02e7cb52e635ae70 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 29 Jul 2024 23:08:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=94=AF=E6=8C=81=E6=8E=92=E9=99=A4=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/config/property/GeneratorProperties.java   |  7 ++++++-
 .../com/youlai/system/model/query/TablePageQuery.java |  9 +++++++++
 .../system/service/impl/GeneratorServiceImpl.java     |  4 ++++
 src/main/resources/application-generator.yml          | 11 +++++++++--
 src/main/resources/mapper/DatabaseMapper.xml          |  7 +++++++
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/youlai/system/config/property/GeneratorProperties.java b/src/main/java/com/youlai/system/config/property/GeneratorProperties.java
index c4325645..c9aa2dc0 100644
--- a/src/main/java/com/youlai/system/config/property/GeneratorProperties.java
+++ b/src/main/java/com/youlai/system/config/property/GeneratorProperties.java
@@ -6,6 +6,7 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,7 +31,6 @@ public class GeneratorProperties {
      */
     private Map<String, TemplateConfig> templateConfigs = MapUtil.newHashMap(true);
 
-
     /**
      * 后端应用名
      */
@@ -42,6 +42,11 @@ public class GeneratorProperties {
      */
     private String frontendAppName;
 
+    /**
+     * 排除数据表
+     */
+    private List<String> excludeTables;
+
     /**
      * 模板配置
      */
diff --git a/src/main/java/com/youlai/system/model/query/TablePageQuery.java b/src/main/java/com/youlai/system/model/query/TablePageQuery.java
index 48f2a286..3844a804 100644
--- a/src/main/java/com/youlai/system/model/query/TablePageQuery.java
+++ b/src/main/java/com/youlai/system/model/query/TablePageQuery.java
@@ -1,10 +1,13 @@
 package com.youlai.system.model.query;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.youlai.system.common.base.BasePageQuery;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 数据表分页查询对象
  *
@@ -19,4 +22,10 @@ public class TablePageQuery extends BasePageQuery {
     @Schema(description="关键字(表名)")
     private String keywords;
 
+    /**
+     * 排除的表名
+     */
+    @JsonIgnore
+    private List<String> excludeTables;
+
 }
diff --git a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
index d96d0635..50713e67 100644
--- a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
@@ -60,6 +60,10 @@ public class GeneratorServiceImpl implements GeneratorService {
      */
     public Page<TablePageVO> getTablePage(TablePageQuery queryParams) {
         Page<TablePageVO> page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize());
+        // 设置排除的表
+        List<String> excludeTables = generatorProperties.getExcludeTables();
+        queryParams.setExcludeTables(excludeTables);
+
         return databaseMapper.getTablePage(page, queryParams);
     }
 
diff --git a/src/main/resources/application-generator.yml b/src/main/resources/application-generator.yml
index d8359790..87acfb78 100644
--- a/src/main/resources/application-generator.yml
+++ b/src/main/resources/application-generator.yml
@@ -1,9 +1,16 @@
 # 代码生成器配置
 generator:
+  # 后端项目名称
+  backendAppName: youlai-boot
+  # 前端项目名称
+  frontendAppName: vue3-element-admin
+  # 默认配置
   defaultConfig:
     author: youlaitech
-  backendAppName: youlai-boot
-  frontendAppName: vue3-element-admin
+  # 排除数据表
+  excludeTables:
+    - gen_config
+    - gen_field_config
   ## 模板配置
   templateConfigs:
     Controller:
diff --git a/src/main/resources/mapper/DatabaseMapper.xml b/src/main/resources/mapper/DatabaseMapper.xml
index 646ec80a..43c48698 100644
--- a/src/main/resources/mapper/DatabaseMapper.xml
+++ b/src/main/resources/mapper/DatabaseMapper.xml
@@ -20,6 +20,13 @@
             <if test="queryParams.keywords != null and queryParams.keywords.trim() neq ''">
                 AND TABLE_NAME LIKE CONCAT('%',#{queryParams.keywords},'%')
             </if>
+        <!-- 排除的表 -->
+        <if test="queryParams.excludeTables != null and queryParams.excludeTables.size() > 0">
+            AND TABLE_NAME NOT IN
+            <foreach collection="queryParams.excludeTables" item="excludeTable" open="(" close=")" separator=",">
+                #{excludeTable}
+            </foreach>
+        </if>
         ORDER BY
             CREATE_TIME DESC
     </select>