REQ-3581: 改字段名称

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

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的合同不能重复
+     * 幂等编码, 最大长度200. 使用appCode和bizCode的合同不能重复
-     * <p/>
-     * 如果需要重复发起合同, 需要使用不同的bizCode, 建议: String.format("%s:%s", '真实业务编码', '序号或UUID')
      */
-    @NotBlank(message = "bizCode不能为空")
+    @NotBlank(message = "idempotentCode不能为空")
-    private String bizCode;
+    private String idempotentCode = UUID.randomUUID().toString();
 
     /**
      * 合同发起方信息

ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/GetContractDetailByBizCodeRequest.java

@@ -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;
-
-}

ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetContractDetailByBizCodeResponse.java

@@ -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;
-
-}

ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java

@@ -36,7 +36,7 @@ public class EssContract extends BaseEntity<EssContract> {
     /**
      * 业务编码
      */
-    private String bizCode = UuidUtils.generateUuid();
+    private String idempotentCode = UuidUtils.generateUuid();
 
     /**
      * 合同发起方单位id

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 {

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());