diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java index b471250..cf7411b 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java @@ -31,11 +31,4 @@ public class SuperBasic implements Serializable { */ private String serviceId; - /** - * 创建空对象 - * @return 空类型对象 - */ - public static OC ofNull(){ - return (OC) builder().build(); - } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java index f7bebd2..340571e 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java @@ -47,7 +47,7 @@ public class BaseController { /** * 返回成功 */ - public Result success () { + public Result success () { return Result.success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java index e46a363..456e576 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java @@ -2,6 +2,7 @@ package com.muyu.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.DataPageResp; @@ -12,6 +13,7 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysConfig; import com.muyu.system.domain.model.SysConfigPageQueryModel; +import com.muyu.system.domain.rep.SysConfigAddReq; import com.muyu.system.domain.rep.SysConfigListReq; import com.muyu.system.service.SysConfigService; import io.swagger.v3.oas.annotations.Operation; @@ -78,12 +80,11 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:add") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysConfig config) { - if (!configService.checkConfigKeyUnique(config)) { - return error("新增参数'" + config.getConfigName() + "'失败,参数键名已存在"); + public Result add (@Validated @RequestBody SysConfigAddReq sysConfigAddReq) { + if (!configService.checkConfigKeyUnique(sysConfigAddReq.getConfigKey())) { + return error(StringUtils.format("新增参数「{}」失败,参数键名已存在",sysConfigAddReq.getConfigName())); } - config.setCreateBy(SecurityUtils.getUsername()); - return toAjax(configService.save(config)); + return toAjax(configService.save(SysConfig.addReqBuild(sysConfigAddReq))); } /** @@ -91,9 +92,9 @@ public class SysConfigController extends BaseController { */ @RequiresPermissions("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) - @PutMapping - public Result edit (@Validated @RequestBody SysConfig config) { - if (!configService.checkConfigKeyUnique(config)) { + @PutMapping("/{sysConfigId}") + public Result edit (@PathVariable("sysConfigId")Long sysConfigId, @Validated @RequestBody SysConfig config) { + if (!configService.checkConfigKeyUnique(config.getConfigKey())) { return error("修改参数'" + config.getConfigName() + "'失败,参数键名已存在"); } config.setUpdateBy(SecurityUtils.getUsername()); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java index 6f7e8bf..57820cb 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.system.domain.rep.SysConfigAddReq; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -78,4 +80,19 @@ public class SysConfig extends BaseEntity { return configValue; } + /** + * 通过请求参数直接构建数据库 + * @param addReq 请求对象 + * @return 添加对象 + */ + public static SysConfig addReqBuild(SysConfigAddReq addReq) { + return builder() + .configKey(addReq.getConfigKey()) + .configName(addReq.getConfigName()) + .configValue(addReq.getConfigValue()) + .configType(addReq.getConfigType()) + .remark(addReq.getRemark()) + .createBy(SecurityUtils.getUsername()) + .build(); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java index 06fd114..829100d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java @@ -56,4 +56,12 @@ public class SysDeptPageQueryModel extends QueryModel { .deptId(deptId) .build(); } + + /** + * 构建一个空对象 + * @return 查询模型空对象 + */ + public static SysDeptPageQueryModel ofNull() { + return new SysDeptPageQueryModel(); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigAddReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigAddReq.java new file mode 100644 index 0000000..d089d20 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigAddReq.java @@ -0,0 +1,45 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: 系统配置添加请求 + * @author dongzeliang + * @date 2025/1/10 17:24 + * @version 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SysConfigAddReq { + + /** + * 参数名称 + */ + private String configName; + + /** + * 参数键名 + */ + private String configKey; + + /** + * 参数键值 + */ + private String configValue; + + /** + * 系统内置(Y是 N否) + */ + private String configType; + + /** + * 备注 + */ + private String remark; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigUpdReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigUpdReq.java new file mode 100644 index 0000000..53b902e --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigUpdReq.java @@ -0,0 +1,10 @@ +package com.muyu.system.domain.rep; + +/** + * @author dongzeliang + * @version 1.0 + * @description: 系统配置修改请求 + * @date 2025/1/14 10:39 + */ +public class SysConfigUpdReq { +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java index 1d5880b..901134b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -27,10 +27,10 @@ public interface SysConfigService extends IService { /** * 检测参数是否唯一 - * @param config - * @return + * @param configKey 配置唯一Key + * @return 重复:true 不重复:false */ - boolean checkConfigKeyUnique (SysConfig config); + boolean checkConfigKeyUnique (String configKey); /** * 刷新缓存 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java index aa56456..8582443 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java @@ -61,10 +61,10 @@ public class SysConfigServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysConfig::getConfigKey, config.getConfigKey()); - return this.count(queryWrapper) > 0; + queryWrapper.eq(SysConfig::getConfigKey, configKey); + return this.count(queryWrapper) == 0; } @Override