From 3dd247491a2d3af823c71aa114fcc72054635fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 16 Dec 2019 19:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=80=82=E9=85=8D=E5=99=A8?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/softswitch/SuitClientModel.java | 2 ++ .../estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 2 +- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 3 ++- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 13 +++++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 7e64efb..a798d8b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/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; + /** * 请求来源 */ 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 abee745..3b2e47c 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 @@ -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; /** diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index ef26b09..4b67424 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/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); } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index c451f54..7757888 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/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 = "适配信息")