diff --git a/sql/mysql5/youlai_boot.sql b/sql/mysql5/youlai_boot.sql index 2dc34ffa..35351802 100644 --- a/sql/mysql5/youlai_boot.sql +++ b/sql/mysql5/youlai_boot.sql @@ -33,8 +33,8 @@ CREATE TABLE `sys_config` ( `create_by` bigint NOT NULL COMMENT '创建人ID', `update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_by` bigint DEFAULT NULL COMMENT '更新人ID', - `is_deleted` tinyint(1) NOT NULL COMMENT '逻辑删除标识(0-未删除 1-已删除)', - PRIMARY KEY (`id`) + `is_deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '逻辑删除标识(0-未删除 1-已删除)', + PRIMARY KEY (`id`) ) ENGINE=InnoDB COMMENT='系统配置'; -- ---------------------------- diff --git a/sql/mysql8/youlai_boot.sql b/sql/mysql8/youlai_boot.sql index 8b926e48..8f011701 100644 --- a/sql/mysql8/youlai_boot.sql +++ b/sql/mysql8/youlai_boot.sql @@ -34,7 +34,7 @@ CREATE TABLE `sys_config` ( `create_by` bigint NOT NULL COMMENT '创建人ID', `update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_by` bigint DEFAULT NULL COMMENT '更新人ID', - `is_deleted` tinyint(1) NOT NULL COMMENT '逻辑删除标识(0-未删除 1-已删除)', + `is_deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '逻辑删除标识(0-未删除 1-已删除)', PRIMARY KEY (`id`) ) ENGINE=InnoDB COMMENT='系统配置'; diff --git a/src/main/java/com/youlai/system/common/constant/SymbolConstant.java b/src/main/java/com/youlai/system/common/constant/SymbolConstant.java index 101fb71a..0f14d539 100644 --- a/src/main/java/com/youlai/system/common/constant/SymbolConstant.java +++ b/src/main/java/com/youlai/system/common/constant/SymbolConstant.java @@ -7,6 +7,7 @@ package com.youlai.system.common.constant; * @since 2024-7-29 11:46:08 */ public interface SymbolConstant { + /** * 符号：点 */ @@ -28,7 +29,7 @@ public interface SymbolConstant { String COMMA = ","; /** - * 符号：左花括号 } + * 符号：左花括号 { */ String LEFT_CURLY_BRACKET = "{"; diff --git a/src/main/java/com/youlai/system/common/constant/SystemConstants.java b/src/main/java/com/youlai/system/common/constant/SystemConstants.java index dc02cf42..4eca3ee3 100644 --- a/src/main/java/com/youlai/system/common/constant/SystemConstants.java +++ b/src/main/java/com/youlai/system/common/constant/SystemConstants.java @@ -13,7 +13,6 @@ public interface SystemConstants { */ Long ROOT_NODE_ID = 0L; - /** * 系统默认密码 */ @@ -24,14 +23,4 @@ public interface SystemConstants { */ String ROOT_ROLE_CODE = "ROOT"; - /** - * 未删除状态 - */ - Integer NOT_DELETED_STATUS = 0; - - /** - * 删除状态 - */ - Integer DELETED_STATUS = 1; - } diff --git a/src/main/java/com/youlai/system/service/SysConfigService.java b/src/main/java/com/youlai/system/service/SysConfigService.java index 4a11eb3e..21296ac7 100644 --- a/src/main/java/com/youlai/system/service/SysConfigService.java +++ b/src/main/java/com/youlai/system/service/SysConfigService.java @@ -33,7 +33,7 @@ public interface SysConfigService extends IService { * 获取系统配置表单数据 * * @param id 系统配置ID - * @return + * @return 系统配置表单数据 */ ConfigForm getConfigFormData(Long id); @@ -52,7 +52,6 @@ public interface SysConfigService extends IService { */ boolean delete(Long ids); - /** * 刷新系统配置缓存 * @return 是否刷新成功 @@ -62,7 +61,7 @@ public interface SysConfigService extends IService { /** * 获取系统配置 * @param key 配置键 - * @return 配置value + * @return 配置值 */ Object getSystemConfig(String key); diff --git a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java index 2bae1e56..679948f1 100644 --- a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.youlai.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -48,9 +49,9 @@ public class SysConfigServiceImpl extends ServiceImpl page(ConfigPageQuery configPageQuery) { Page page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize()); - QueryWrapper query = new QueryWrapper<>(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); if(StringUtils.isNotBlank(configPageQuery.getKeywords())) { - query.and(q -> q.like("config_key", configPageQuery.getKeywords()).or().like("config_name", configPageQuery.getKeywords())); + query.and(q -> q.like(SysConfig::getConfigKey, configPageQuery.getKeywords()).or().like(SysConfig::getConfigName, configPageQuery.getKeywords())); } Page pageList = this.page(page, query); return sysConfigConverter.convertToPageVo(pageList); @@ -63,10 +64,11 @@ public class SysConfigServiceImpl extends ServiceImpl().eq("config_key", configForm.getConfigKey())) == 0, "配置键已存在"); + Assert.isTrue( + super.count(new LambdaQueryWrapper().eq(SysConfig::getConfigKey, configForm.getConfigKey())) == 0, + "配置键已存在"); SysConfig sysConfig = sysConfigConverter.toEntity(configForm); sysConfig.setCreateBy(SecurityUtils.getUserId()); - sysConfig.setIsDeleted(SystemConstants.NOT_DELETED_STATUS); return this.save(sysConfig); } @@ -74,7 +76,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq("config_key", configForm.getConfigKey()).ne("id", id)) == 0, "配置键已存在"); + Assert.isTrue( + super.count(new LambdaQueryWrapper().eq(SysConfig::getConfigKey, configForm.getConfigKey()).ne(SysConfig::getId, id)) == 0, + "配置键已存在"); SysConfig sysConfig = sysConfigConverter.toEntity(configForm); sysConfig.setUpdateBy(SecurityUtils.getUserId()); return this.update(sysConfig, new QueryWrapper().eq("id", id)); @@ -104,7 +108,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq("id", id)); + return super.remove(new LambdaQueryWrapper().eq(SysConfig::getId, id)); } return false; } @@ -128,7 +132,7 @@ public class SysConfigServiceImpl extends ServiceImpl