软件适配器异常信息优化

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

@@ -48,7 +48,9 @@ public class SuitClientModel {
     /**
      * 适配结果信息
      */
+    @XStreamCDATA
     private String suitMessage;
+
     /**
      * 请求来源
      */

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

@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 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 com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -44,6 +43,7 @@ public class SuitServerModel {
      * 适配结果信息
      */
 //    @XStreamImplicit
+    @XStreamCDATA
     private String suitMessage;
 
     /**

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -81,9 +81,10 @@ public class CoreHqlPack {
 
         if(resource != null){
             DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result);
+            DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result);
             DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result);
             DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result);
-            DdlPreparedPack.getStringEqualPack(resource.getResourceKey(),"resourceKey",result);
+            DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result);
             DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result);
         }
 

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

@@ -98,6 +98,19 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配结果")
     private Integer suitResult;
 
+    @Column(name = "SUIT_START_DATE_TIME")
+    @ApiParam(value = "适配开始时间")
+    private String suitStartTime;
+
+    @Column(name = "SUIT_END_DATE_TIME")
+    @ApiParam(value = "适配结束时间")
+    private String suitEndTime;
+
+    @Column(name = "EXECUTE_TIME")
+    @ApiParam(value = "执行耗时")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long executeTime;
+
     @Lob
     @Column(name = "SUIT_MESSAGE")
     @ApiParam(value = "适配信息")