From 436638827f9ae3b1025782da22f2cc7e0f483cbc Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Mon, 29 Jul 2024 18:36:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20id=20=E7=BC=BA=E5=A4=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/youlai/system/common/base/BaseEntity.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/youlai/system/common/base/BaseEntity.java b/src/main/java/com/youlai/system/common/base/BaseEntity.java index d6a89e8d..89320fd2 100644 --- a/src/main/java/com/youlai/system/common/base/BaseEntity.java +++ b/src/main/java/com/youlai/system/common/base/BaseEntity.java @@ -1,8 +1,6 @@ package com.youlai.system.common.base; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; @@ -25,6 +23,12 @@ public class BaseEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; + /** + * 主键ID + */ + @TableId(type = IdType.AUTO) + private Long id; + /** * 创建时间 */ @@ -41,9 +45,4 @@ public class BaseEntity implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; - /** - * 逻辑删除标识 (0-未删除 1-已删除) - */ - @TableLogic(value = "0", delval = "1") - private Integer isDeleted; } 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 2/4] =?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 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 From efe4bcf3f6ab06cc0a8a0a1cfdb4be71ee6a02c5 Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Tue, 30 Jul 2024 00:22:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=94=AF=E6=8C=81=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youlai/system/controller/SysDictController.java | 7 +++++++ .../youlai/system/model/entity/GenFieldConfig.java | 6 ++++++ .../com/youlai/system/model/form/GenConfigForm.java | 3 +++ .../com/youlai/system/service/SysDictService.java | 6 ++++++ .../system/service/impl/SysDictServiceImpl.java | 13 ++++++++++++- src/main/resources/templates/generator/index.vue.vm | 13 +++++++++---- 6 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/youlai/system/controller/SysDictController.java b/src/main/java/com/youlai/system/controller/SysDictController.java index d1137cf4..811ea999 100644 --- a/src/main/java/com/youlai/system/controller/SysDictController.java +++ b/src/main/java/com/youlai/system/controller/SysDictController.java @@ -44,6 +44,13 @@ public class SysDictController { return PageResult.success(result); } + @Operation(summary = "字典列表") + @GetMapping("/list") + public Result> getDictList() { + List