From 3a88bd7a784fe74c1da8c1a81fffdddff9e46715 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Mar 2020 11:14:57 +0800 Subject: [PATCH] ptl --- .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 39 ++++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 6455056..ce00e6d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -6,11 +6,12 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.ptl.bean.PtlConfig; import cn.estsh.i3plus.pojo.ptl.bean.PtlPrinterConfigure; import cn.estsh.i3plus.pojo.ptl.bean.PtlPrintingQueue; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; import java.util.*; import java.util.stream.Collectors; @@ -34,13 +35,13 @@ public class PtlHqlPack { public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + if (!StringUtils.isEmpty(bean.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); - if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(bean.getCreateDateTimeStart()) && !StringUtils.isEmpty(bean.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); } // 封装有效状态、删除状态、创建人和创建时间 @@ -51,6 +52,20 @@ public class PtlHqlPack { } /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** * 打印机管理信息分页查询条件 * * @param ptlPrinterConfigure @@ -85,4 +100,22 @@ public class PtlHqlPack { return result; } + /** + * 配置信息 + * @param ptlConfig + * @return + */ + public static DdlPackBean getPtlConfig(PtlConfig ptlConfig) { + DdlPackBean packBean = getAllBaseDataByNormalPro(ptlConfig, ptlConfig.getOrganizeCode()); + if (!StringUtils.isEmpty(ptlConfig.getCfgCode())) { + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgCode(), "cfgCode", packBean); + } + if (!StringUtils.isEmpty(ptlConfig.getCfgType())) { + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgType(), "cfgType", packBean); + } + if (!StringUtils.isEmpty(ptlConfig.getCfgKey())) { + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgKey(), "cfgKey", packBean); + } + return packBean; + } }