From 0b3d2d6815db509d0c40737c0ffee30138e869e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Fri, 8 May 2020 14:34:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8DREST=20=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=99=A8=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java   | 9 +++++++++
 .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java    | 1 +
 .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java     | 3 +++
 3 files changed, 13 insertions(+)

diff --git 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
index 3b2e47c..cb371c4 100644
--- 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
@@ -8,6 +8,10 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 import java.util.Map;
 
@@ -20,9 +24,12 @@ import java.util.Map;
  **/
 @Data
 @XStreamAlias("server")
+@XmlRootElement(name ="server")
+@XmlAccessorType(XmlAccessType.NONE)
 public class SuitServerModel {
 
     // 执行方法命令
+    @XmlElement
     @ApiParam(value = "适配器code")
     private String suitCaseCode;
     /* 认证使用 以后使用 */
@@ -31,6 +38,7 @@ public class SuitServerModel {
     // 请求ID
     private String requestId;
     // 传输单对象
+    @XmlElement(name = "data")
     private Object obj;
     // 传输集合
     private List list;
@@ -44,6 +52,7 @@ public class SuitServerModel {
      */
 //    @XStreamImplicit
     @XStreamCDATA
+    @XmlElement
     private String suitMessage;
 
     /**
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java
index da487e2..4f87d41 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java
@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api(value = "长数据", description = "长数据")
 public class BsLongData extends BaseBean {
 
+    private static final long serialVersionUID = -329128754646765129L;
     @Column(name = "REF_ID")
     @ApiParam(value = "关联id")
     private Long refId;
diff --git 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
index fad903c..051d0c9 100644
--- 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
@@ -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.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -40,6 +42,7 @@ public class BsSuitCaseREST extends BaseBean {
     //CommonEnumUtil.HTTP_METHOD_TYPE
     @Column(name = "REQUEST_METHOD_ID")
     @ApiParam(value = "请求方式id")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class)
     private Integer requestMethodId;
 
     @Transient