feat(softswitch):适配记录,FTP文件支持SID

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java

@@ -231,7 +231,8 @@ public class BlockSoftSwitchEnumUtil {
         CLOUD(5,"Cloud调用"),
         REST(6,"REST调用"),
         WEB_SERVICE(7,"WebService"),
-        SOCKET(8,"socket");
+        SOCKET(8,"socket"),
+        RETRY(9,"重试");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -245,12 +245,12 @@ public class CommonEnumUtil {
             return tmp;
         }
 
-        public static int descOf(boolean desc) {
-            return desc ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
+        public static int boolOfOfVal(boolean boolVal) {
+            return boolVal ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
         }
 
-        public static int descOf(int desc) {
-            return desc == 0 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
+        public static int intOfVal(int boolIntVal) {
+            return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
         }
 
         public static TRUE_OR_FALSE valueOfEnum(int value){

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

@@ -39,6 +39,17 @@ public class SuitClientModel implements Serializable {
     private Integer actionId;
 
     /**
+     * 调用方自定义标识
+     */
+    @XStreamAsAttribute
+    private String suitSid;
+
+    /**
+     * 重试记录id
+     */
+    private Long retryRecordId;
+
+    /**
      * 适配器信息
      */
     private BsSuitCaseModel suitCaseModel;
@@ -142,4 +153,23 @@ public class SuitClientModel implements Serializable {
         // 设置默认
         this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
     }
+
+    public SuitClientModel(SuitModel suitModel, BsSuitCaseModel suitCaseModel) {
+        this.requestSource = suitModel.getRequestSource();
+        this.suitSid = suitModel.getSuitSid();
+        this.retryRecordId = suitModel.getRetryRecordId();
+
+        this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId();
+        this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId();
+        this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode();
+        this.suitCaseModel = suitCaseModel;
+
+        // 设置默认
+        this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
+        // 设置默认
+        this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+        // 设置默认
+        this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+    }
+
 }

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :
+ *      软适配执行适配器(客户端服务端适配总入口)
+ *      所需的参数模型
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-10-28 15:51
+ * @Modify:
+ **/
+@Data
+public class SuitModel implements Serializable {
+
+    private static final long serialVersionUID = 8981933192688480221L;
+
+    @ApiParam(value = "适配器代码")
+    private String suitCaseCode;
+
+    @ApiParam(value = "适配SID")
+    private String suitSid;
+
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.REQUEST_SOURCE.class)
+    @ApiParam(value = "适配来源")
+    private Integer requestSource;
+
+    @ApiParam(value = "重试记录id")
+    private Long retryRecordId;
+
+    @ApiParam(value = "适配器参数XML")
+    private String paramXml;
+
+    @ApiParam(value = "适配器参数")
+    private List<BsSuitCaseParam> bsSuitCaseParamList;
+
+}

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import io.swagger.annotations.ApiModel;
@@ -23,6 +24,9 @@ public class SuitRecordModel {
     @ApiModelProperty("适配文件")
     private BsSuitFile bsSuitFile;
 
+    @ApiModelProperty("分页信息")
+    private Pager pager;
+
     public SuitRecordModel() {
     }
 

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

@@ -39,6 +39,13 @@ public class SuitServerModel implements Serializable {
 
     // 请求ID
     private String requestId;
+
+    // 调用方自定义标识
+    private String suitSid;
+
+    // 重试记录id
+    private Long retryRecordId;
+
     // 传输单对象
     @XmlElement(name = "data")
     @XStreamAlias("data")
@@ -110,4 +117,14 @@ public class SuitServerModel implements Serializable {
 
     //    @XStreamImplicit
     private String analyzeMessage;
+
+    public SuitServerModel(){
+    }
+    public SuitServerModel(SuitModel suitModel){
+        this.suitCaseCode = suitModel.getSuitCaseCode();
+        this.requestSource = suitModel.getRequestSource();
+        this.suitSid= suitModel.getSuitSid();
+        this.retryRecordId = suitModel.getRetryRecordId();
+        this.obj = suitModel.getParamXml();
+    }
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -61,6 +61,15 @@ public class BsSuitRecord extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitCaseDetailId;
 
+    @Column(name = "SUIT_SID")
+    @ApiParam(value = "适配记录SID")
+    private String suitSid;
+
+    @Column(name = "RETRY_RECORD_ID")
+    @ApiParam(value = "重试记录id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long retryRecordId;
+
     @Column(name = "SUIT_METHOD_ID")
     @ApiParam(value = "适配方式id枚举（定时适配，主动适配）")
     private Integer suitMethodId;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -320,6 +320,7 @@ public class SoftSwitchHqlPack {
 
         DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.getStringLikePack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);