From 8550ecf531c26c5f8f0684dee9ae0e8ffe6bf9ac Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Feb 2025 18:39:14 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/contract/EssContractInfo.java | 2 +- .../api/request/CreateContractRequest.java | 9 +++---- .../GetContractDetailByBizCodeRequest.java | 26 ------------------- .../GetContractDetailByBizCodeResponse.java | 19 -------------- .../ess/server/entity/EssContract.java | 2 +- .../ess/server/ess/ContractManager.java | 2 +- .../server/ess/support/ContractSupport.java | 2 +- 7 files changed, 8 insertions(+), 54 deletions(-) delete mode 100644 ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/GetContractDetailByBizCodeRequest.java delete mode 100644 ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetContractDetailByBizCodeResponse.java diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/EssContractInfo.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/EssContractInfo.java index ba0bd9d9..2c1a973b 100644 --- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/EssContractInfo.java +++ b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/EssContractInfo.java @@ -21,7 +21,7 @@ public class EssContractInfo { /** * 业务编码 */ - private String bizCode; + private String idempotentCode; /** * 合同发起方单位id diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/CreateContractRequest.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/CreateContractRequest.java index fb18ff31..1bfc14d3 100644 --- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/CreateContractRequest.java +++ b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/CreateContractRequest.java @@ -10,6 +10,7 @@ import lombok.Setter; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.util.UUID; /** * @author yanglin @@ -25,12 +26,10 @@ public abstract class CreateContractRequest { private String appCode; /** - * 业务编码, 最大长度200. 使用appCode和bizCode的合同不能重复 - *

- * 如果需要重复发起合同, 需要使用不同的bizCode, 建议: String.format("%s:%s", '真实业务编码', '序号或UUID') + * 幂等编码, 最大长度200. 使用appCode和bizCode的合同不能重复 */ - @NotBlank(message = "bizCode不能为空") - private String bizCode; + @NotBlank(message = "idempotentCode不能为空") + private String idempotentCode = UUID.randomUUID().toString(); /** * 合同发起方信息 diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/GetContractDetailByBizCodeRequest.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/GetContractDetailByBizCodeRequest.java deleted file mode 100644 index 1269ff30..00000000 --- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/GetContractDetailByBizCodeRequest.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.axzo.nanopart.ess.api.request; - -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotBlank; - -/** - * @author yanglin - */ -@Setter @Getter -public class GetContractDetailByBizCodeRequest { - - /** - * 发起合同的应用或业务场景 - */ - @NotBlank(message = "appCode不能为空") - private String appCode; - - /** - * 业务编码 - */ - @NotBlank(message = "bizCode不能为空") - private String bizCode; - -} diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetContractDetailByBizCodeResponse.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetContractDetailByBizCodeResponse.java deleted file mode 100644 index e64c5127..00000000 --- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetContractDetailByBizCodeResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.axzo.nanopart.ess.api.response; - -import cn.axzo.nanopart.ess.api.domain.contract.EssContractInfo; -import lombok.Getter; -import lombok.Setter; - -/** - * @author yanglin - */ -@Setter -@Getter -public class GetContractDetailByBizCodeResponse { - - /** - * 合同信息 - */ - private EssContractInfo contract; - -} diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java index b57af6c2..2ac7740b 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java @@ -36,7 +36,7 @@ public class EssContract extends BaseEntity { /** * 业务编码 */ - private String bizCode = UuidUtils.generateUuid(); + private String idempotentCode = UuidUtils.generateUuid(); /** * 合同发起方单位id diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java index b330822a..0ed29f81 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java @@ -46,7 +46,7 @@ public class ContractManager { public CreateContractByFileResponse createContractByFile(CreateContractByFileRequest request) { - essLogDao.logRequest("createContractByFile", request.getBizCode(), request); + essLogDao.logRequest("createContractByFile", request.getIdempotentCode(), request); contractSupport.validateCreateContract(request.getContract()); EssContract contract = contractSupport.saveContractByFile(request); try { diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/ContractSupport.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/ContractSupport.java index 8950f65e..0beeb0f4 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/ContractSupport.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/ContractSupport.java @@ -65,7 +65,7 @@ public class ContractSupport { try { EssContract contract = new EssContract(); contract.setAppCode(request.getAppCode()); - contract.setBizCode(request.getBizCode()); + contract.setIdempotentCode(request.getIdempotentCode()); contract.setCreatorOuId(request.getCreator().getOuId()); contract.setCreatorPersonId(request.getCreator().getPersonId()); contract.setContractName(request.getByFile().getContractName());