From 94b92b341368984332697b9a328a4251d793c0bf Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 28 Jun 2023 17:51:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90config=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=9E=8B=EF=BC=9A?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysConfigTypeController.java | 13 ++++++++ .../modular/service/SysConfigTypeService.java | 30 +++++++++++++++++-- .../roses/kernel/dict/api/DictApi.java | 12 ++++++-- ...dParam.java => SimpleDictUpdateParam.java} | 2 +- .../modular/service/impl/DictServiceImpl.java | 17 +++++++++-- 5 files changed, 66 insertions(+), 8 deletions(-) rename kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/pojo/{SimpleDictAddParam.java => SimpleDictUpdateParam.java} (98%) diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/controller/SysConfigTypeController.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/controller/SysConfigTypeController.java index e2144a0f2..9c82a5470 100644 --- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/controller/SysConfigTypeController.java +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/controller/SysConfigTypeController.java @@ -27,6 +27,7 @@ package cn.stylefeng.roses.kernel.config.modular.controller; import cn.stylefeng.roses.kernel.config.modular.pojo.param.SysConfigTypeParam; import cn.stylefeng.roses.kernel.config.modular.service.SysConfigTypeService; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; +import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -77,6 +78,18 @@ public class SysConfigTypeController { return new SuccessResponseData<>(); } + /** + * 编辑配置类型 + * + * @author fengshuonan + * @since 2023/6/28 17:00 + */ + @PostResource(name = "编辑配置类型", path = "/sysConfigType/edit") + public ResponseData edit(@RequestBody @Validated(BaseRequest.edit.class) SysConfigTypeParam sysConfigTypeParam) { + sysConfigTypeService.edit(sysConfigTypeParam); + return new SuccessResponseData<>(); + } + } diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/SysConfigTypeService.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/SysConfigTypeService.java index c02217051..531e010af 100644 --- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/SysConfigTypeService.java +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/SysConfigTypeService.java @@ -4,7 +4,7 @@ import cn.stylefeng.roses.kernel.config.api.constants.ConfigConstants; import cn.stylefeng.roses.kernel.config.modular.pojo.param.SysConfigTypeParam; import cn.stylefeng.roses.kernel.dict.api.DictApi; import cn.stylefeng.roses.kernel.dict.api.DictTypeApi; -import cn.stylefeng.roses.kernel.dict.api.pojo.SimpleDictAddParam; +import cn.stylefeng.roses.kernel.dict.api.pojo.SimpleDictUpdateParam; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import org.springframework.stereotype.Service; @@ -26,6 +26,9 @@ public class SysConfigTypeService { @Resource private DictTypeApi dictTypeApi; + @Resource + private SysConfigService sysConfigService; + /** * 查询系统配置类型列表 *

@@ -52,7 +55,7 @@ public class SysConfigTypeService { Long dictTypeId = dictTypeApi.getDictTypeIdByDictTypeCode(ConfigConstants.CONFIG_GROUP_DICT_TYPE_CODE); // 配置类型信息转化为新增字典的参数信息 - SimpleDictAddParam simpleDictAddParam = new SimpleDictAddParam(); + SimpleDictUpdateParam simpleDictAddParam = new SimpleDictUpdateParam(); simpleDictAddParam.setDictTypeId(dictTypeId); simpleDictAddParam.setDictName(sysConfigTypeParam.getConfigTypeName()); simpleDictAddParam.setDictCode(sysConfigTypeParam.getConfigTypeCode()); @@ -62,4 +65,27 @@ public class SysConfigTypeService { dictApi.simpleAddDict(simpleDictAddParam); } + /** + * 更新字典类型 + * + * @author fengshuonan + * @since 2023/6/28 17:32 + */ + public void edit(SysConfigTypeParam sysConfigTypeParam) { + + // 查询字典类型 + Long dictTypeId = dictTypeApi.getDictTypeIdByDictTypeCode(ConfigConstants.CONFIG_GROUP_DICT_TYPE_CODE); + + // 配置类型信息转化为编辑字典的参数信息 + SimpleDictUpdateParam simpleDictAddParam = new SimpleDictUpdateParam(); + simpleDictAddParam.setDictId(sysConfigTypeParam.getConfigTypeId()); + simpleDictAddParam.setDictTypeId(dictTypeId); + simpleDictAddParam.setDictName(sysConfigTypeParam.getConfigTypeName()); + simpleDictAddParam.setDictCode(sysConfigTypeParam.getConfigTypeCode()); + simpleDictAddParam.setDictSort(sysConfigTypeParam.getConfigTypeSort()); + + // 编辑字典 + dictApi.simpleEditDict(simpleDictAddParam); + } + } diff --git a/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/DictApi.java b/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/DictApi.java index f6ba612b5..eb47fc2d0 100644 --- a/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/DictApi.java +++ b/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/DictApi.java @@ -24,7 +24,7 @@ */ package cn.stylefeng.roses.kernel.dict.api; -import cn.stylefeng.roses.kernel.dict.api.pojo.SimpleDictAddParam; +import cn.stylefeng.roses.kernel.dict.api.pojo.SimpleDictUpdateParam; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import java.util.List; @@ -82,6 +82,14 @@ public interface DictApi { * @author fengshuonan * @since 2023/6/28 17:26 */ - void simpleAddDict(SimpleDictAddParam simpleDictAddParam); + void simpleAddDict(SimpleDictUpdateParam simpleDictUpdateParam); + + /** + * 外部系统调用本模块进行更新字典 + * + * @author fengshuonan + * @since 2023/6/28 17:26 + */ + void simpleEditDict(SimpleDictUpdateParam simpleDictUpdateParam); } diff --git a/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/pojo/SimpleDictAddParam.java b/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/pojo/SimpleDictUpdateParam.java similarity index 98% rename from kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/pojo/SimpleDictAddParam.java rename to kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/pojo/SimpleDictUpdateParam.java index a732e8b7d..9152c728f 100644 --- a/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/pojo/SimpleDictAddParam.java +++ b/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/pojo/SimpleDictUpdateParam.java @@ -36,7 +36,7 @@ import java.math.BigDecimal; * @since 2023/6/28 17:21 */ @Data -public class SimpleDictAddParam { +public class SimpleDictUpdateParam { /** * 字典id diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java index a80f82fd8..c9c6ec808 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java @@ -29,7 +29,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.dict.api.exception.DictException; import cn.stylefeng.roses.kernel.dict.api.exception.enums.DictExceptionEnum; -import cn.stylefeng.roses.kernel.dict.api.pojo.SimpleDictAddParam; +import cn.stylefeng.roses.kernel.dict.api.pojo.SimpleDictUpdateParam; import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict; import cn.stylefeng.roses.kernel.dict.modular.factory.DictFactory; import cn.stylefeng.roses.kernel.dict.modular.mapper.DictMapper; @@ -278,11 +278,11 @@ public class DictServiceImpl extends ServiceImpl implements } @Override - public void simpleAddDict(SimpleDictAddParam simpleDictAddParam) { + public void simpleAddDict(SimpleDictUpdateParam simpleDictUpdateParam) { // 组装添加字典的参数 DictRequest dictRequest = new DictRequest(); - BeanUtil.copyProperties(simpleDictAddParam, dictRequest); + BeanUtil.copyProperties(simpleDictUpdateParam, dictRequest); // 设置为启用 dictRequest.setStatusFlag(StatusEnum.ENABLE.getCode()); @@ -291,6 +291,17 @@ public class DictServiceImpl extends ServiceImpl implements this.add(dictRequest); } + @Override + public void simpleEditDict(SimpleDictUpdateParam simpleDictUpdateParam) { + + // 组装编辑字典的参数 + DictRequest dictRequest = new DictRequest(); + BeanUtil.copyProperties(simpleDictUpdateParam, dictRequest); + + // 更新字典 + this.edit(dictRequest); + } + /** * 获取详细信息 *