From 649c8ab87067a179839b61eba3b92bae28daa52b Mon Sep 17 00:00:00 2001 From: zc <2256222053@qq.com> Date: Mon, 29 Jul 2024 14:59:53 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=A8sql=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加生成代码菜单和权限 --- sql/mysql5/youlai_boot.sql | 5 ++++- sql/mysql8/youlai_boot.sql | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sql/mysql5/youlai_boot.sql b/sql/mysql5/youlai_boot.sql index a9a24a5a..f5e76113 100644 --- a/sql/mysql5/youlai_boot.sql +++ b/sql/mysql5/youlai_boot.sql @@ -197,6 +197,8 @@ INSERT INTO `sys_menu` VALUES (110, 0, '0', '路由参数', 2, NULL, '/route-par INSERT INTO `sys_menu` VALUES (111, 110, '0,110', '参数(type=1)', 1, NULL, 'route-param-type1', 'demo/route-param', NULL, 0, 1, 1, 1, 'el-icon-Star', NULL, '2024-05-26 21:59:24', '2024-05-26 21:59:37', '{\"type\": \"1\"}'); INSERT INTO `sys_menu` VALUES (112, 110, '0,110', '参数(type=2)', 1, NULL, 'route-param-type2', 'demo/route-param', NULL, 0, 1, 1, 2, 'el-icon-StarFilled', NULL, '2024-05-26 21:46:55', '2024-05-26 21:59:45', '{\"type\": \"2\"}'); INSERT INTO `sys_menu` VALUES (117, 1, '0,1', '系统日志', 1, 'Log', 'log', 'system/log/index', NULL, 0, 1, 1, 6, 'document', NULL, '2024-06-28 07:43:16', '2024-06-28 07:43:16', NULL); +INSERT INTO `sys_menu` VALUES (118, 0, '0', '系统工具', 2, NULL, '/tool', 'Layout', NULL, 0, 1, 1, 2, 'menu', NULL, '2024-07-13 08:41:07', '2024-07-13 08:41:07', NULL); +INSERT INTO `sys_menu` VALUES (119, 118, '0,118', '代码生成(Alpha)', 1, 'Generator', 'generator', 'generator/index', NULL, 0, 1, 1, 1, 'code', NULL, '2024-07-13 08:44:51', '2024-07-13 08:44:51', NULL); -- ---------------------------- -- Table structure for sys_message @@ -322,7 +324,8 @@ INSERT INTO `sys_role_menu` VALUES (2, 114); INSERT INTO `sys_role_menu` VALUES (2, 115); INSERT INTO `sys_role_menu` VALUES (2, 116); INSERT INTO `sys_role_menu` VALUES (2, 117); - +INSERT INTO `sys_role_menu` VALUES (2, 118); +INSERT INTO `sys_role_menu` VALUES (2, 119); -- ---------------------------- -- Table structure for sys_user -- ---------------------------- diff --git a/sql/mysql8/youlai_boot.sql b/sql/mysql8/youlai_boot.sql index ee253c96..79b7f396 100644 --- a/sql/mysql8/youlai_boot.sql +++ b/sql/mysql8/youlai_boot.sql @@ -197,6 +197,8 @@ INSERT INTO `sys_menu` VALUES (110, 0, '0', '路由参数', 2, NULL, '/route-par INSERT INTO `sys_menu` VALUES (111, 110, '0,110', '参数(type=1)', 1, NULL, 'route-param-type1', 'demo/route-param', NULL, 0, 1, 1, 1, 'el-icon-Star', NULL, '2024-05-26 21:59:24', '2024-05-26 21:59:37', '{\"type\": \"1\"}'); INSERT INTO `sys_menu` VALUES (112, 110, '0,110', '参数(type=2)', 1, NULL, 'route-param-type2', 'demo/route-param', NULL, 0, 1, 1, 2, 'el-icon-StarFilled', NULL, '2024-05-26 21:46:55', '2024-05-26 21:59:45', '{\"type\": \"2\"}'); INSERT INTO `sys_menu` VALUES (117, 1, '0,1', '系统日志', 1, 'Log', 'log', 'system/log/index', NULL, 0, 1, 1, 6, 'document', NULL, '2024-06-28 07:43:16', '2024-06-28 07:43:16', NULL); +INSERT INTO `sys_menu` VALUES (118, 0, '0', '系统工具', 2, NULL, '/tool', 'Layout', NULL, 0, 1, 1, 2, 'menu', NULL, '2024-07-13 08:41:07', '2024-07-13 08:41:07', NULL); +INSERT INTO `sys_menu` VALUES (119, 118, '0,118', '代码生成(Alpha)', 1, 'Generator', 'generator', 'generator/index', NULL, 0, 1, 1, 1, 'code', NULL, '2024-07-13 08:44:51', '2024-07-13 08:44:51', NULL); -- ---------------------------- -- Table structure for sys_message @@ -322,7 +324,8 @@ INSERT INTO `sys_role_menu` VALUES (2, 114); INSERT INTO `sys_role_menu` VALUES (2, 115); INSERT INTO `sys_role_menu` VALUES (2, 116); INSERT INTO `sys_role_menu` VALUES (2, 117); - +INSERT INTO `sys_role_menu` VALUES (2, 118); +INSERT INTO `sys_role_menu` VALUES (2, 119); -- ---------------------------- -- Table structure for sys_user -- ---------------------------- From 4ed3e280d7f3a391da6c8734203b4fdee9be51e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Mon, 29 Jul 2024 10:27:27 +0000 Subject: [PATCH 2/8] =?UTF-8?q?Revert=20"fix(BaseEntity):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=BC=BA=E5=B0=91id=E5=B1=9E=E6=80=A7=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 003e125bfb93b30e3049b8cb48c5f008037f5526. --- .../com/youlai/system/common/base/BaseEntity.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 89320fd2..d6a89e8d 100644 --- a/src/main/java/com/youlai/system/common/base/BaseEntity.java +++ b/src/main/java/com/youlai/system/common/base/BaseEntity.java @@ -1,6 +1,8 @@ package com.youlai.system.common.base; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; @@ -23,12 +25,6 @@ public class BaseEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * 主键ID - */ - @TableId(type = IdType.AUTO) - private Long id; - /** * 创建时间 */ @@ -45,4 +41,9 @@ 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 147d70899443cc6e33152353008c30f969041d6f Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Mon, 29 Jul 2024 18:29:35 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6develop=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 --- .../youlai/system/mapper/GenConfigMapper.java | 20 +++++++++++++++++++ .../system/mapper/GenFieldConfigMapper.java | 20 +++++++++++++++++++ .../youlai/system/model/entity/SysDept.java | 8 -------- .../youlai/system/model/entity/SysDict.java | 7 ------- .../youlai/system/model/entity/SysRole.java | 7 ------- .../youlai/system/model/entity/SysUser.java | 7 ------- .../service/impl/GenConfigServiceImpl.java | 1 + 7 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 src/main/java/com/youlai/system/mapper/GenConfigMapper.java create mode 100644 src/main/java/com/youlai/system/mapper/GenFieldConfigMapper.java diff --git a/src/main/java/com/youlai/system/mapper/GenConfigMapper.java b/src/main/java/com/youlai/system/mapper/GenConfigMapper.java new file mode 100644 index 00000000..a307568e --- /dev/null +++ b/src/main/java/com/youlai/system/mapper/GenConfigMapper.java @@ -0,0 +1,20 @@ +package com.youlai.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.youlai.system.model.entity.GenConfig; +import org.apache.ibatis.annotations.Mapper; + +/** + * 代码生成基础配置访问层 + * + * @author Ray + * @since 2.10.0 + */ +@Mapper +public interface GenConfigMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/youlai/system/mapper/GenFieldConfigMapper.java b/src/main/java/com/youlai/system/mapper/GenFieldConfigMapper.java new file mode 100644 index 00000000..258d11a4 --- /dev/null +++ b/src/main/java/com/youlai/system/mapper/GenFieldConfigMapper.java @@ -0,0 +1,20 @@ +package com.youlai.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.youlai.system.model.entity.GenFieldConfig; +import org.apache.ibatis.annotations.Mapper; + +/** + * 代码生成字段配置访问层 + * + * @author Ray + * @since 2.10.0 + */ +@Mapper +public interface GenFieldConfigMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/youlai/system/model/entity/SysDept.java b/src/main/java/com/youlai/system/model/entity/SysDept.java index 79be15ff..f2952e30 100644 --- a/src/main/java/com/youlai/system/model/entity/SysDept.java +++ b/src/main/java/com/youlai/system/model/entity/SysDept.java @@ -1,8 +1,5 @@ package com.youlai.system.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; - import com.youlai.system.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; @@ -16,11 +13,6 @@ import lombok.Setter; @Getter @Setter public class SysDept extends BaseEntity { - /** - * 主键 - */ - @TableId(type = IdType.AUTO) - private Long id; /** * 部门名称 diff --git a/src/main/java/com/youlai/system/model/entity/SysDict.java b/src/main/java/com/youlai/system/model/entity/SysDict.java index be28b821..84380234 100644 --- a/src/main/java/com/youlai/system/model/entity/SysDict.java +++ b/src/main/java/com/youlai/system/model/entity/SysDict.java @@ -1,7 +1,5 @@ package com.youlai.system.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.youlai.system.common.base.BaseEntity; import lombok.Data; @@ -13,11 +11,6 @@ import lombok.Data; */ @Data public class SysDict extends BaseEntity { - /** - * 主键 - */ - @TableId(type = IdType.AUTO) - private Long id; /** * 类型名称 diff --git a/src/main/java/com/youlai/system/model/entity/SysRole.java b/src/main/java/com/youlai/system/model/entity/SysRole.java index 5f485a0f..6b4ca6a7 100644 --- a/src/main/java/com/youlai/system/model/entity/SysRole.java +++ b/src/main/java/com/youlai/system/model/entity/SysRole.java @@ -1,7 +1,5 @@ package com.youlai.system.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.youlai.system.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; @@ -15,11 +13,6 @@ import lombok.Setter; @Getter @Setter public class SysRole extends BaseEntity { - /** - * 主键 - */ - @TableId(type = IdType.AUTO) - private Long id; /** * 角色名称 diff --git a/src/main/java/com/youlai/system/model/entity/SysUser.java b/src/main/java/com/youlai/system/model/entity/SysUser.java index 3375558f..6e79dc64 100644 --- a/src/main/java/com/youlai/system/model/entity/SysUser.java +++ b/src/main/java/com/youlai/system/model/entity/SysUser.java @@ -1,7 +1,5 @@ package com.youlai.system.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.youlai.system.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; @@ -12,11 +10,6 @@ import lombok.Setter; @Getter @Setter public class SysUser extends BaseEntity { - /** - * 用户 ID - */ - @TableId(type = IdType.AUTO) - private Long id; /** * 用户名 diff --git a/src/main/java/com/youlai/system/service/impl/GenConfigServiceImpl.java b/src/main/java/com/youlai/system/service/impl/GenConfigServiceImpl.java index 83971051..746cd496 100644 --- a/src/main/java/com/youlai/system/service/impl/GenConfigServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/GenConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.youlai.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.system.mapper.GenConfigMapper; import com.youlai.system.model.entity.GenConfig; import com.youlai.system.service.GenConfigService; From 5a148b5d7d2eb296d95a8cc58e9cda08ef62f056 Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Mon, 29 Jul 2024 18:31:47 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6develop=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=BC=BA=E5=A4=B1=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/GenConfigMapper.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/resources/mapper/GenConfigMapper.xml diff --git a/src/main/resources/mapper/GenConfigMapper.xml b/src/main/resources/mapper/GenConfigMapper.xml new file mode 100644 index 00000000..ba394cd3 --- /dev/null +++ b/src/main/resources/mapper/GenConfigMapper.xml @@ -0,0 +1,7 @@ + + + + + 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 5/8] =?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 6/8] =?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 7/8] =?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