From 02d60ed1a8b35cc96ffa8ebf95cfcdef7c7aaa6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 20 Aug 2019 14:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=80=82=E9=85=8D=E5=99=A8-?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=82=E9=85=8D=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/softswitch/bean/BsParamAdapter.java | 4 +-- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 35 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java index dc12e39..275709a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java @@ -34,9 +34,9 @@ public class BsParamAdapter extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseId; - @Column(name = "SUIT_CASE_NAME") + @Column(name = "SUIT_CASE_NAME_RDD") @ApiParam(value = "适配套件名称") - private String suitCaseName; + private String suitCaseNameRdd; @Column(name = "SUIT_CASE_CODE") @ApiParam(value = "适配套件代码") 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 ccea28f..96b25e9 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.sqlpack; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; @@ -110,4 +111,38 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * 数据适配转换规则查询条件封装 + * @param bsParamAdapter 数据适配转换规则 + * @return + */ + public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean); + + ddlPackBean.setOrderByStr(bsParamAdapter.orderBy()); + + return ddlPackBean; + } + + /** + * 数据适配装换规则唯一校验 + * @param bsParamAdapter 数据适配转换规则 + * @return + */ + public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(), "suitCaseCode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamId(), "suitParamId", ddlPackBean); + + return ddlPackBean; + } + }