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

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

@@ -116,6 +116,7 @@ public class BlockSoftSwitchEnumUtil {
         SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
 //        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
         CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
+        CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"),
 
         /* 数据源 */
         CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),

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

@@ -29,8 +29,11 @@ public class SuitParamModel {
     private String pathKey;
     /* 标签内容 */
     private String vaule;
-    /* 标签类型 Default:PARAM_VALUE_TYPE.STRING */
+    /**
-    private Integer type;  // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE
+     * 标签 内容 类型 暂未定义
+     * 设计思路： type 说明这个字段属于什么类型的值， 例如 Date,BigDecimal 等特殊类型标注
+     */
+    private String type;
 
     /* 标签属性 */
     private Map<String,String> attr;
@@ -38,4 +41,20 @@ public class SuitParamModel {
     private SuitParamModel parent;
     /* 标签子集 */
     private List<SuitParamModel> childList;
+
+    @Override
+    public String toString() {
+        return "SuitParamModel{" +
+                "tagName='" + tagName + '\'' +
+                ", classPath='" + classPath + '\'' +
+                ", methodName='" + methodName + '\'' +
+                ", id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", pathKey='" + pathKey + '\'' +
+                ", vaule='" + vaule + '\'' +
+                ", type=" + type +
+                ", attr=" + attr +
+                ", childList=" + childList +
+                '}';
+    }
 }

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

@@ -3,9 +3,10 @@ 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.XStreamOmitField;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+
 import java.util.List;
 import java.util.Map;
 
@@ -40,40 +41,43 @@ public class SuitServerModel {
     /**
      * 适配结果信息
      */
+//    @XStreamImplicit
     private String suitMessage;
 
     /**
      * 适配状态码
      */
+//    @XStreamImplicit
     private String suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
 
     /**
      * 适配结果
      */
+//    @XStreamImplicit
     private boolean suitSuccess = true;
 
     /**
      * 适配记录
      */
-    @XStreamOmitField
+    @XStreamImplicit
     private BsSuitRecord bsSuitRecord;
 
     /**
      * 适配器信息
      */
-    @XStreamOmitField
+    @XStreamImplicit
     private BsSuitCaseModel bsSuitCaseModel;
 
     /**
      * 请求来源
      */
-    @XStreamOmitField
+//    @XStreamImplicit
     private Integer requestSource;
 
     /**
      * 适配方式
      */
-    @XStreamOmitField
+//    @XStreamImplicit
     private Integer suitMethodId;
 
     public int getSuitMethodIdVal(){
@@ -83,6 +87,6 @@ public class SuitServerModel {
         return suitMethodId.intValue();
     }
 
-    @XStreamOmitField
+//    @XStreamImplicit
     private String analyzeMessage;
 }