Merge remote-tracking branch 'origin/test' into test

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

@@ -876,7 +876,8 @@ public class BlockSoftSwitchEnumUtil {
         SUIT_MESSAGE(10, "适配信息"),
         REQUEST_ORGIN_PARAM(20,  "请求原始参数"),
         ORIGINAL_MESSAGE(30,  "原始报文"),
-        CONVERTED_MESSAGE(40,  "转换报文");
+        CONVERTED_MESSAGE(40,  "转换报文"),
+        SUIT_SEND_MESSAGE(50,  "适配发送报文");
 
         private int value;
         private String description;

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

@@ -5741,16 +5741,18 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PLC_DATA_TYPE {
-
-        INT("int", "数字"),
-        STRING("string", "字符串"),
-        BOOLEAN("boolean", "布尔");
+        STRING("10", "String", "字符串"),
+        BOOLEAN("20","Boolean",  "布尔"),
+        WORD("30", "Word", "整形-Word"),
+        DWORD("40","Dword",  "整形-DWord");
 
         private String value;
+        private String code;
         private String description;
 
-        PLC_DATA_TYPE(String value, String description) {
+        PLC_DATA_TYPE(String value, String code,String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 

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

@@ -56,6 +56,12 @@ public class SuitClientModel implements Serializable {
     private String suitMessage;
 
     /**
+     * 适配发送报文信息
+     */
+    @XStreamCDATA
+    private String suitSendMessage;
+
+    /**
      * 请求来源
      */
     private Integer requestSource;

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -9,6 +11,7 @@ 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;
@@ -41,15 +44,21 @@ public class BsSuitCaseDataSourceTable extends BaseBean {
 
     @Column(name = "OPERATE_TYPE_ID")
     @ApiParam(value = "操作类型")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.class)
     private Integer operateTypeId;
 
-    public int getOperateTypeIdVal(){
-        if(operateTypeId == null){
+    public int getOperateTypeIdVal() {
+        if (operateTypeId == null) {
             return -1;
         }
         return operateTypeId.intValue();
     }
 
+
+    public String getOperateTypeIdTxt() {
+        return operateTypeId == null ? "无" : BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.valueOfDescription(operateTypeId);
+    }
+
     @Column(name = "EXECUTE_SQL")
     @ApiParam(value = "执行sql")
     private String executeSql;
@@ -62,8 +71,8 @@ public class BsSuitCaseDataSourceTable extends BaseBean {
     @ApiParam(value = "是否有返回")
     private Integer isReturn;
 
-    public int getIsReturnVal(){
-        if(isReturn == null){
+    public int getIsReturnVal() {
+        if (isReturn == null) {
             return -1;
         }
         return isReturn.intValue();

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

@@ -46,12 +46,20 @@ public class BsSuitCaseREST extends BaseBean {
     @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class)
     private Integer requestMethodId;
 
+    public String getRequestMethodIdTxt(){
+        return requestMethodId == null ? "无" : CommonEnumUtil.HTTP_METHOD_TYPE.valueOfDescription(requestMethodId);
+    }
+
     //CommonEnumUtil.TRUE_OR_FALSE
     @Column(name = "IS_REQUEST_BODY")
     @ApiParam(value = "是否使用requestBody")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
     private Integer isRequestBody;
 
+    public int getIsRequestBodyVal() {
+        return isRequestBody == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isRequestBody;
+    }
+
     @Transient
     @ApiParam(value = "请求头转换")
     private List<BsSuitCaseParam> requestHeaderList;

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

@@ -120,6 +120,11 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配信息 longDataId")
     private String suitMessage;
 
+    // 移动至记录数据表
+    @Column(name = "SUIT_SEND_MESSAGE")
+    @ApiParam(value = "适配发送报文")
+    private String suitSendMessage;
+
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
     private Integer processState;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -132,6 +132,14 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @ApiParam("是否为钢卷料")
     private Integer isSteel;
 
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam("计划交货时间")
+    private String planTime;
+
     /**
      * 不冗余主表数据
      */