From d9dd10761e8242774049c82bf1c3888491f1239b Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 15 Oct 2019 13:29:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?WebService=20=E6=AC=A7=E6=B4=B2=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java | 3 --- .../java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index d43e7a2..b1738c3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -34,6 +34,9 @@ public class XStreamFactory { public static final String CDATA_PREFIX = ""; + private XStreamFactory() { + } + public static XStream getXStream() { final NameCoder nameCoder = new NoNameCoder(); XStream xStream = new XStream(new XppDomDriver(nameCoder) { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index 25838bb..72fcca5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -63,8 +63,5 @@ public class MesDatasource extends BaseBean { @ApiParam("数据库名称") private String dsDbName; - @Column(name = "DS_DB_NAME") - @ApiParam("数据库名称") - private String dsDbName; } 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 725277a..abee745 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; +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; From 95a354f5370282335b2d3b145af69dc6ed9c9c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 15 Oct 2019 13:50:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=A4=84=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index da8290e..5ea76e3 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -384,6 +384,17 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlSuitRecordBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); + + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlSuitDataDetailBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCodeRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); @@ -391,10 +402,22 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + public static DdlPackBean packHqlSuitRecordBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackArray(suitRecordIds,"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getInPackArray(suitRecordIds,"id",ddlPackBean); + DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); + + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getInPackArray(suitRecordIds,"suitRecordId",ddlPackBean); DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);