From 06fcb7f01b5afbec8e1e26ae6fb510c276f5616f Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Thu, 1 Aug 2024 06:59:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=88=A0=E9=99=A4=E7=94=B1=E9=80=BB=E8=BE=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=B0=83=E6=95=B4=E4=B8=BA=E7=89=A9=E7=90=86=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql5/youlai_boot.sql | 4 +--- sql/mysql8/youlai_boot.sql | 4 +--- .../com/youlai/system/controller/GeneratorController.java | 4 ++-- src/main/java/com/youlai/system/model/entity/GenConfig.java | 4 ---- src/main/java/com/youlai/system/service/GeneratorService.java | 2 +- .../com/youlai/system/service/impl/GeneratorServiceImpl.java | 3 +-- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/sql/mysql5/youlai_boot.sql b/sql/mysql5/youlai_boot.sql index f38f3b33..6782d768 100644 --- a/sql/mysql5/youlai_boot.sql +++ b/sql/mysql5/youlai_boot.sql @@ -444,9 +444,8 @@ CREATE TABLE `gen_config` ( `parent_menu_id` bigint DEFAULT NULL COMMENT '上级菜单ID，对应sys_menu的id ', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除', PRIMARY KEY (`id`), - UNIQUE KEY `uk_tablename_deleted` (`table_name`,`is_deleted`) USING BTREE + UNIQUE KEY `uk_tablename_deleted` (`table_name`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='代码生成基础配置表'; -- ---------------------------- @@ -472,7 +471,6 @@ CREATE TABLE `gen_field_config` ( `dict_type` varchar(100) DEFAULT NULL COMMENT '字典类型(sys_dict表的code)', `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` datetime COMMENT '更新时间', - `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='代码生成字段配置表'; diff --git a/sql/mysql8/youlai_boot.sql b/sql/mysql8/youlai_boot.sql index 775a0704..862b1903 100644 --- a/sql/mysql8/youlai_boot.sql +++ b/sql/mysql8/youlai_boot.sql @@ -445,9 +445,8 @@ CREATE TABLE `gen_config` ( `parent_menu_id` bigint DEFAULT NULL COMMENT '上级菜单ID，对应sys_menu的id ', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除', PRIMARY KEY (`id`), - UNIQUE KEY `uk_tablename_deleted` (`table_name`,`is_deleted`) USING BTREE + UNIQUE KEY `uk_tablename` (`table_name`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='代码生成基础配置表'; -- ---------------------------- @@ -473,7 +472,6 @@ CREATE TABLE `gen_field_config` ( `dict_type` varchar(100) DEFAULT NULL COMMENT '字典类型(sys_dict表的code)', `create_time` datetime COMMENT '创建时间', `update_time` datetime COMMENT '更新时间', - `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除', PRIMARY KEY (`id`), ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='代码生成字段配置表'; diff --git a/src/main/java/com/youlai/system/controller/GeneratorController.java b/src/main/java/com/youlai/system/controller/GeneratorController.java index f73525c8..7386cba4 100644 --- a/src/main/java/com/youlai/system/controller/GeneratorController.java +++ b/src/main/java/com/youlai/system/controller/GeneratorController.java @@ -60,8 +60,8 @@ public class GeneratorController { public Result deleteGenConfig( @Parameter(description = "表名", example = "sys_user") @PathVariable String tableName ) { - boolean result = generatorService.deleteGenConfig(tableName); - return Result.judge(result); + generatorService.deleteGenConfig(tableName); + return Result.success(); } @Operation(summary = "获取预览生成代码") diff --git a/src/main/java/com/youlai/system/model/entity/GenConfig.java b/src/main/java/com/youlai/system/model/entity/GenConfig.java index 49420341..59dcd5c5 100644 --- a/src/main/java/com/youlai/system/model/entity/GenConfig.java +++ b/src/main/java/com/youlai/system/model/entity/GenConfig.java @@ -52,8 +52,4 @@ public class GenConfig extends BaseEntity { * 作者 */ private String author; - - - @TableLogic - private Integer isDeleted; } \ No newline at end of file diff --git a/src/main/java/com/youlai/system/service/GeneratorService.java b/src/main/java/com/youlai/system/service/GeneratorService.java index f32e0c78..882e7b9a 100644 --- a/src/main/java/com/youlai/system/service/GeneratorService.java +++ b/src/main/java/com/youlai/system/service/GeneratorService.java @@ -54,5 +54,5 @@ public interface GeneratorService { * @param tableName 表名 * @return */ - boolean deleteGenConfig(String tableName); + void deleteGenConfig(String tableName); } 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 fe1d264c..725b3b21 100644 --- a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java @@ -190,7 +190,7 @@ public class GeneratorServiceImpl implements GeneratorService { * @return */ @Override - public boolean deleteGenConfig(String tableName) { + public void deleteGenConfig(String tableName) { GenConfig genConfig = genConfigService.getOne(new LambdaQueryWrapper() .eq(GenConfig::getTableName, tableName)); @@ -202,7 +202,6 @@ public class GeneratorServiceImpl implements GeneratorService { .eq(GenFieldConfig::getConfigId, genConfig.getId()) ); } - return result; }