diff --git a/src/main/java/com/youlai/system/model/entity/SysConfig.java b/src/main/java/com/youlai/system/model/entity/SysConfig.java index 809e2ae3..a0c52683 100644 --- a/src/main/java/com/youlai/system/model/entity/SysConfig.java +++ b/src/main/java/com/youlai/system/model/entity/SysConfig.java @@ -21,7 +21,7 @@ public class SysConfig extends BaseEntity { @Schema(description = "配置名称") private String configName; - @Schema(description = "配置key") + @Schema(description = "配置键") private String configKey; @Schema(description = "配置值") diff --git a/src/main/java/com/youlai/system/model/form/ConfigForm.java b/src/main/java/com/youlai/system/model/form/ConfigForm.java index 27c4d5b9..2d0fcda4 100644 --- a/src/main/java/com/youlai/system/model/form/ConfigForm.java +++ b/src/main/java/com/youlai/system/model/form/ConfigForm.java @@ -28,8 +28,8 @@ public class ConfigForm implements Serializable { @Schema(description = "配置名称") private String configName; - @NotBlank(message = "配置key不能为空") - @Schema(description = "配置key") + @NotBlank(message = "配置键不能为空") + @Schema(description = "配置键") private String configKey; @NotBlank(message = "配置值不能为空") diff --git a/src/main/java/com/youlai/system/model/vo/ConfigVO.java b/src/main/java/com/youlai/system/model/vo/ConfigVO.java index 21c8e350..a27e971e 100644 --- a/src/main/java/com/youlai/system/model/vo/ConfigVO.java +++ b/src/main/java/com/youlai/system/model/vo/ConfigVO.java @@ -27,7 +27,7 @@ public class ConfigVO { @Schema(description = "配置名称") private String configName; - @Schema(description = "配置key") + @Schema(description = "配置键") private String configKey; @Schema(description = "配置值") diff --git a/src/main/java/com/youlai/system/service/SysConfigService.java b/src/main/java/com/youlai/system/service/SysConfigService.java index c37e54c5..4a11eb3e 100644 --- a/src/main/java/com/youlai/system/service/SysConfigService.java +++ b/src/main/java/com/youlai/system/service/SysConfigService.java @@ -61,7 +61,7 @@ public interface SysConfigService extends IService { /** * 获取系统配置 - * @param key 配置key + * @param key 配置键 * @return 配置value */ 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 991a86e6..2bae1e56 100644 --- a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java @@ -63,7 +63,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq("config_key", configForm.getConfigKey())) == 0, "配置key已存在"); + Assert.isTrue(super.count(new QueryWrapper().eq("config_key", configForm.getConfigKey())) == 0, "配置键已存在"); SysConfig sysConfig = sysConfigConverter.toEntity(configForm); sysConfig.setCreateBy(SecurityUtils.getUserId()); sysConfig.setIsDeleted(SystemConstants.NOT_DELETED_STATUS); @@ -90,7 +90,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq("config_key", configForm.getConfigKey()).ne("id", id)) == 0, "配置key已存在"); + Assert.isTrue(super.count(new QueryWrapper().eq("config_key", configForm.getConfigKey()).ne("id", id)) == 0, "配置键已存在"); SysConfig sysConfig = sysConfigConverter.toEntity(configForm); sysConfig.setUpdateBy(SecurityUtils.getUserId()); return this.update(sysConfig, new QueryWrapper().eq("id", id)); @@ -127,7 +127,7 @@ public class SysConfigServiceImpl extends ServiceImpl