Merge branch 'test' into ext-dev

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -51,6 +52,17 @@ public class BsSuitCaseModel implements Serializable {
     @ApiParam(value = "分页数据")
     private Pager pager;
 
+
+    // 请求ID
+    @ApiParam(value = "请求ID")
+    private String requestId;
+
+    /**
+     * 业务id列表
+     */
+    @ApiParam(value = "业务id列表")
+    private List<String> busiIdList;
+
     public BsSuitCaseModel() {
     }
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description :
@@ -116,6 +117,19 @@ public class SuitClientModel implements Serializable {
     @XStreamCDATA
     private Object suitResultMessage;
 
+    // 请求ID
+    private String requestId;
+
+    /**
+     * 业务id列表
+     */
+    private List<String> busiIdList;
+
+    /**
+     * 适配是否重复
+     */
+    private Boolean duplicate;
+
     private boolean isNeedRetry = false;
 
     public SuitClientModel() {
@@ -135,6 +149,10 @@ public class SuitClientModel implements Serializable {
         this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
         // 设置默认
         this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+
+        this.requestId = suitCaseModel.getRequestId();
+        this.busiIdList = suitCaseModel.getBusiIdList();
+        this.duplicate = Boolean.FALSE;
     }
 
     public SuitClientModel(Integer requestSource, Integer suitMethodId, BsSuitCaseModel suitCaseModel) {
@@ -152,6 +170,11 @@ public class SuitClientModel implements Serializable {
         this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
         // 设置默认
         this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+
+
+        this.requestId = suitCaseModel.getRequestId();
+        this.busiIdList = suitCaseModel.getBusiIdList();
+        this.duplicate = Boolean.FALSE;
     }
 
     public SuitClientModel(SuitModel suitModel, BsSuitCaseModel suitCaseModel) {
@@ -170,6 +193,10 @@ public class SuitClientModel implements Serializable {
         this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
         // 设置默认
         this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+
+        this.requestId = suitModel.getRequestId();
+        this.busiIdList = suitModel.getBusiIdList();
+        this.duplicate = Boolean.FALSE;
     }
 
 }