Merge branch 'dev' into test

6 years ago · 790c0b4ec6
parent 7ce12a9c85 7131271edc
commit 790c0b4ec6
38 changed files with 257 additions and 11 deletions
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
@ -1,11 +1,15 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

 import javax.persistence.Column;
 import java.util.Date;
+import java.util.List;

 /**
 * @Description :订单基类
@ -48,4 +52,8 @@ public class BaseOrder extends BaseAPS {
    @Column(name="RECEIVE_DATE")
    @ApiParam(value ="接单日期")
    private Date receiveDate;
+
+    public List<Work> getWorks() {
+        return BeanRelation.list(this, EBaseOrder.Works);
+    }
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java
@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+
 /**
 * @Description :规则基类
 * @Reference :
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.DATA_LINK_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java
@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EExportDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -35,4 +38,17 @@ public class ExportDetail extends BaseAPS {
    @Column(name="IN_NAME")
    @ApiParam(value ="内部表名")
    private String inName;
+
+    @Column(name="PROJECT_ID")
+    @ApiParam(value ="导出项目ID")
+    private Long projectId;
+
+    public ExportProject getProject() {
+        return BeanRelation.get(this, EExportDetail.Project);
+    }
+
+    public void setProject(ExportProject project) {
+        this.projectId = project != null ? project.getId() : 0l;
+        BeanRelation.set(this, EExportDetail.Project, project);
+    }
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EExportProject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -7,6 +10,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;

 /**
 * @Description :数据导出明细集合
@ -23,4 +27,21 @@ public class ExportProject extends BaseAPS {
    @Column(name="NAME")
    @ApiParam(value ="标识名")
    private String name;
+
+    @Column(name="LINK_ID")
+    @ApiParam(value ="数据源连接")
+    private Long linkId;
+
+    public DataLink getLink() {
+        return BeanRelation.get(this, EExportProject.Link);
+    }
+
+    public void setLink(DataLink link) {
+        this.linkId = link != null ? link.getId() : 0l;
+        BeanRelation.set(this, EExportProject.Link, link);
+    }
+
+    public List<ExportDetail> getDetails() {
+        return BeanRelation.list(this, EExportProject.Details);
+    }
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonIgnore;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
 import io.swagger.annotations.Api;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.CALENDAR_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import lombok.Data;

--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS;
 import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import lombok.Data;

--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.enums.DIRECTION;
 import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_LOCK_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_TIME_TYPE;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@ -1,7 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS;
 import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE;
+import cn.estsh.i3plus.pojo.aps.holders.EWork;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -90,4 +93,17 @@ public class Work extends BaseCode {
    @Column(name="PLAN_RESOURCE")
    @ApiParam(value ="计划主资源")
    private String planResource;
+
+    @Column(name="ORDER_ID")
+    @ApiParam(value ="订单")
+    private Long orderId;
+
+    public BaseOrder getOrder() {
+        return BeanRelation.get(this, EWork.Order);
+    }
+
+    public void setOrder(BaseOrder order) {
+        this.orderId = order != null ? order.getId() : 0l;
+        BeanRelation.set(this, EWork.Order, order);
+    }
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.WORK_RELATION_TYPE;
 import io.swagger.annotations.Api;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;

+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.aps.bean;
+package cn.estsh.i3plus.pojo.aps.common;

 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import lombok.Data;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java
@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.aps.bean;
+package cn.estsh.i3plus.pojo.aps.common;

 import io.swagger.annotations.ApiParam;
 import lombok.Data;
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java
@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EExportDetail {
+    Project
+}
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
@ -237,7 +237,7 @@ public class BlockSoftSwitchEnumUtil {
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum VERIFICATION_METHOD{
-        LOGIN(1,"登录");
+        IMPP_LOGIN(1,"IMPP登录");

        private int value;
        private String description;
@ -264,6 +264,16 @@ public class BlockSoftSwitchEnumUtil {
            }
            return tmp;
        }
+
+        public static VERIFICATION_METHOD valueOf(int val) {
+            VERIFICATION_METHOD tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
    }

    /**
@ -589,4 +599,40 @@ public class BlockSoftSwitchEnumUtil {
        }
    }

+    /**
+     * 请求方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REQUEST_METHOD{
+        GET(1,"GET"),
+        POST(2,"POST"),
+        PUT(3,"PUT"),
+        DELETE(4,"DELETE");
+
+        private int value;
+        private String description;
+
+        REQUEST_METHOD(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@ -997,6 +997,16 @@ public class CommonEnumUtil {
            }
            return tmp;
        }
+
+        public static HTTP_METHOD_TYPE valueOf(int val) {
+            HTTP_METHOD_TYPE tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
    }

    /**
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
@ -1,10 +1,7 @@
 package cn.estsh.i3plus.pojo.model.softswitch;

 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
+import cn.estsh.i3plus.pojo.softswitch.bean.*;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -35,6 +32,9 @@ public class BsSuitCaseModel implements Serializable {
    @ApiParam(value = "Web Service 适配套件")
    private BsSuitCaseWebService webService;

+    @ApiParam(value = "REST 适配套件")
+    private BsSuitCaseREST bsSuitCaseREST;
+
    @ApiParam(value = "分页数据")
    private Pager pager;

--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
@ -1,6 +1,9 @@
 package cn.estsh.i3plus.pojo.model.softswitch;

+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

@ -19,10 +22,11 @@ import java.util.Map;
 public class SuitServerModel {

    // 执行方法命令
-    @ApiParam(value = "适配命令(枚举)")
-    private Integer actionId;
+    @ApiParam(value = "适配器code")
+    private String suitCaseCode;
    /* 认证使用 以后使用 */
    private String token;
+
    // 传输单对象
    private Object obj;
    // 传输集合
@ -35,10 +39,52 @@ public class SuitServerModel {
    /**
     * 适配结果信息
     */
+    @XStreamImplicit
    private String suitMessage;
+
    /**
     * 适配状态码
     */
-    private String suitCaseStatusCode;
+    @XStreamImplicit
+    private String suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
+
+    /**
+     * 适配结果
+     */
+    @XStreamImplicit
+    private boolean suitSuccess = true;
+
+    /**
+     * 适配记录
+     */
+    @XStreamImplicit
+    private BsSuitRecord bsSuitRecord;
+
+    /**
+     * 适配器信息
+     */
+    @XStreamImplicit
+    private BsSuitCaseModel bsSuitCaseModel;
+
+    /**
+     * 请求来源
+     */
+    @XStreamImplicit
+    private Integer requestSource;
+
+    /**
+     * 适配方式
+     */
+    @XStreamImplicit
+    private Integer suitMethodId;
+
+    public int getSuitMethodIdVal(){
+        if(suitMethodId == null){
+            return -1;
+        }
+        return suitMethodId.intValue();
+    }

+    @XStreamImplicit
+    private String analyzeMessage;
 }
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java
@ -44,6 +44,11 @@ public class BsSslKey extends BaseBean {
    @ApiParam(value = "认证url")
    private String verificationUrl;

+    //CommonEnumUtil.HTTP_METHOD_TYPE
+    @Column(name = "REQUEST_METHOD_ID")
+    @ApiParam(value = "请求方式id")
+    private Integer requestMethodId;
+
    @Column(name = "KEY_TYPE_ID")
    @ApiParam(value = "证书类型枚举")
    private Integer keyTypeId;
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
@ -58,7 +58,7 @@ public class BsSuitCase extends BaseBean {
    private Long suitTypeId;

    public long getSuitTypeIdVal(){
-        if(suitTypeId != null){
+        if(suitTypeId == null){
            return -1;
        }
        return suitTypeId.longValue();
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;

 /**
 * @Description : 适配器出入参
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java
@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.softswitch.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-18 16:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SUIT_CASE_REST")
+@Api(value = "适配器出入参", description = "适配器出入参")
+public class BsSuitCaseREST extends BaseBean {
+
+    @Column(name = "SUIT_CASE_ID")
+    @ApiParam(value = "套件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    //CommonEnumUtil.HTTP_METHOD_TYPE
+    @Column(name = "REQUEST_METHOD_ID")
+    @ApiParam(value = "请求方式id")
+    private Integer requestMethodId;
+
+    @Transient
+    @ApiParam(value = "请求头转换")
+    private List<BsSuitCaseParam> requestHeaderList;
+}