From fab444aa8c6b557a689bf52d4cc8794d760a7209 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Tue, 23 Sep 2025 09:56:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E7=BB=84=E4=BB=B6=E5=90=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E9=87=8D=E5=A4=8D=E7=9A=84=E6=8A=A5=E9=94=99=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/permission/MenuServiceImpl.java | 11 +++++-- .../contract/DemoContractController.java | 2 +- .../rpc/config/RpcConfiguration.java | 3 +- .../contract/DemoContractServiceImpl.java | 30 +++++++++++-------- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/MenuServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/MenuServiceImpl.java index 80764b8c..ba10bafe 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/MenuServiceImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/MenuServiceImpl.java @@ -3,6 +3,8 @@ package com.zt.plat.module.system.service.permission; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Lists; import com.zt.plat.framework.common.enums.CommonStatusEnum; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.system.controller.admin.permission.vo.menu.MenuListReqVO; @@ -12,8 +14,6 @@ import com.zt.plat.module.system.dal.mysql.permission.MenuMapper; import com.zt.plat.module.system.dal.redis.RedisKeyConstants; import com.zt.plat.module.system.enums.permission.MenuTypeEnum; import com.zt.plat.module.system.service.tenant.TenantService; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Lists; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.CacheEvict; @@ -256,7 +256,12 @@ public class MenuServiceImpl implements MenuService { if (StrUtil.isBlank(componentName)) { return; } - MenuDO menu = menuMapper.selectByComponentName(componentName); + MenuDO menu = null; + try { + menu = menuMapper.selectByComponentName(componentName); + } catch (Exception e) { + throw exception(MENU_COMPONENT_NAME_DUPLICATE); + } if (menu == null) { return; } diff --git a/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/controller/admin/contract/DemoContractController.java b/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/controller/admin/contract/DemoContractController.java index 36381edc..9fe6037a 100644 --- a/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/controller/admin/contract/DemoContractController.java +++ b/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/controller/admin/contract/DemoContractController.java @@ -1,5 +1,6 @@ package com.zt.plat.module.template.controller.admin.contract; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; import com.zt.plat.framework.business.annotation.FileUploadController; import com.zt.plat.framework.business.controller.AbstractFileUploadController; @@ -19,7 +20,6 @@ import com.zt.plat.module.template.controller.admin.contract.vo.DemoContractResp import com.zt.plat.module.template.controller.admin.contract.vo.DemoContractSaveReqVO; import com.zt.plat.module.template.dal.dataobject.contract.DemoContractDO; import com.zt.plat.module.template.service.contract.DemoContractService; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/framework/rpc/config/RpcConfiguration.java b/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/framework/rpc/config/RpcConfiguration.java index a474c7c6..36a245a9 100644 --- a/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/framework/rpc/config/RpcConfiguration.java +++ b/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/framework/rpc/config/RpcConfiguration.java @@ -4,10 +4,11 @@ import com.zt.plat.module.infra.api.config.ConfigApi; import com.zt.plat.module.infra.api.file.FileApi; import com.zt.plat.module.infra.api.websocket.WebSocketSenderApi; import com.zt.plat.module.system.api.dept.DeptApi; +import com.zt.plat.module.system.api.sequence.SequenceApi; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; @Configuration(value = "templateRpcConfiguration", proxyBeanMethods = false) -@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, ConfigApi.class, DeptApi.class}) +@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, ConfigApi.class, DeptApi.class, SequenceApi.class}) public class RpcConfiguration { } diff --git a/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/service/contract/DemoContractServiceImpl.java b/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/service/contract/DemoContractServiceImpl.java index 1e2c90f6..84ca3efa 100644 --- a/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/service/contract/DemoContractServiceImpl.java +++ b/zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/service/contract/DemoContractServiceImpl.java @@ -1,24 +1,23 @@ package com.zt.plat.module.template.service.contract; import cn.hutool.core.collection.CollUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import com.zt.plat.module.template.controller.admin.contract.vo.*; -import com.zt.plat.module.template.dal.dataobject.contract.DemoContractDO; +import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.util.object.BeanUtils; - +import com.zt.plat.module.system.api.sequence.SequenceApi; +import com.zt.plat.module.template.controller.admin.contract.vo.DemoContractPageReqVO; +import com.zt.plat.module.template.controller.admin.contract.vo.DemoContractRespVO; +import com.zt.plat.module.template.controller.admin.contract.vo.DemoContractSaveReqVO; +import com.zt.plat.module.template.dal.dataobject.contract.DemoContractDO; import com.zt.plat.module.template.dal.mysql.contract.DemoContractMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.List; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; -import static com.zt.plat.module.template.enums.ErrorCodeConstants.*; +import static com.zt.plat.module.template.enums.ErrorCodeConstants.DEMO_CONTRACT_NOT_EXISTS; /** * 合同 Service 实现类 @@ -32,10 +31,15 @@ public class DemoContractServiceImpl implements DemoContractService { @Resource private DemoContractMapper demoContractMapper; + @Resource + private SequenceApi sequenceApi; + @Override public DemoContractRespVO createDemoContract(DemoContractSaveReqVO createReqVO) { // 插入 DemoContractDO demoContract = BeanUtils.toBean(createReqVO, DemoContractDO.class); + CommonResult seq = sequenceApi.getNextSequence("SEQ", null, null); + demoContract.setCode(seq.getData()); demoContractMapper.insert(demoContract); // 返回 return BeanUtils.toBean(demoContract, DemoContractRespVO.class);