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 templateConfigs = MapUtil.newHashMap(true); - /** * 后端应用名 */ @@ -42,6 +42,11 @@ public class GeneratorProperties { */ private String frontendAppName; + /** + * 排除数据表 + */ + private List 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 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 getTablePage(TablePageQuery queryParams) { Page page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize()); + // 设置排除的表 + List 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 @@ AND TABLE_NAME LIKE CONCAT('%',#{queryParams.keywords},'%') + + + AND TABLE_NAME NOT IN + + #{excludeTable} + + ORDER BY CREATE_TIME DESC