From 71087e5d43f6d99625098ed09dc270d76ab52ff2 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Jul 2019 20:47:45 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) 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 f568f5f..641f8b3 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 @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.commons.lang3.StringUtils; import java.util.List; +import java.util.stream.Collectors; /** * @Description : 平台对象封装 @@ -146,6 +147,17 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){ + DdlPackBean result = new DdlPackBean(); + + // String Like + DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(organize.getName(),"organizeCode",result); + // Number In + DdlPreparedPack.getInPackList(idList,"id",result); + return result; + } + public static String packHqlSysOrganize(Long[] ids, Integer typeId){ StringBuffer result = new StringBuffer(); @@ -784,4 +796,18 @@ public class CoreHqlPack { return ddlPackBean; } + + /** + * 查询当前用户所有组织数据 + * @param sysRefUserDepartments + * @return + */ + public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",packBean); + + return packBean; + } } \ No newline at end of file From af278555d0aa503016e6de9fa1a61c24124f30b2 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Thu, 4 Jul 2019 20:59:58 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=94=B9=E5=8A=A8=E4=BB=A5=E5=8F=8Abug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 69 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +- 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 4c690e0..5b70bb8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -126,6 +126,26 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "总数量") private Double totalQty; + @Transient + @ApiParam(value = "项目名称") + private String prodCfgTypeName; + + @Transient + @ApiParam(value = "箱数", example = "-1") + private Integer boxQty; + + @Transient + @ApiParam(value = "零件数", example = "-1") + private Double partQty; + + @Transient + @ApiParam(value = "ERP库存地") + private String areaNo; + + public String getAreaNo() { + return areaNo; + } + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } @@ -166,6 +186,14 @@ public class WmsStockQuan extends BaseBean { return this.totalQty == null ? 0 : this.totalQty; } + public Double getPartQtyVal() { + return this.partQty == null ? 0 : this.partQty; + } + + public Integer getBoxQtyVal() { + return this.boxQty == null ? 0 : this.boxQty; + } + public WmsStockQuan() { } @@ -196,4 +224,45 @@ public class WmsStockQuan extends BaseBean { this.lockQty = lockQty; this.scrapQty = scrapQty; } + + public WmsStockQuan(String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit, + Double sumQty, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { + this.locateNo = locateNo; + this.boxQty = boxQty; + this.partQty = partQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.sumQty = sumQty; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.scrapQty = scrapQty; + } + + public WmsStockQuan(String whNo, String zoneNo, String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.boxQty = boxQty; + this.partQty = partQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.scrapQty = scrapQty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 0d9a204..cb68549 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2000,8 +2000,8 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result); - DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result); + DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitCode(), "unitCode", result); + DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitName(), "unitName", result); DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result); getStringBuilderPack(wmsUnit, result); From f0e0867e2c0b2da9339c3cf57df8cc4550a1bdc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 5 Jul 2019 10:01:57 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8pojo?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index e3454c5..a85fbac 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -502,7 +502,11 @@ public class WmsEnumUtil { SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"), NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"), NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"), - LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"); + LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"), + ASN(190, "ASN", "ASN"), + PO(200, "PO", "PO"), + QC(210, "QC", "QC"), + AMPR(210, "AMPR", "AMPR"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 3c78462..2d9ff35 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -105,6 +105,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "状态", example = "0") public Integer itemStatus; + @Column(name="REF_ITEM") + @ApiParam("关联单据行号") + public String refItem; + /** * ASN,PO,SO */ From fba99de79556595f4e9790b111259604a9d6b309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 5 Jul 2019 10:06:36 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 88f4ff5..b51bb14 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -506,7 +506,7 @@ public class WmsEnumUtil { ASN(190, "ASN", "ASN"), PO(200, "PO", "PO"), QC(210, "QC", "QC"), - AMPR(210, "AMPR", "AMPR"); + AMPR(220, "AMPR", "AMPR"); private int value; From 0ca528bade4ba699c777edd5e6664a18d6f3aeee Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 4 Jul 2019 20:56:43 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 48 ++++++++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-) 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 641f8b3..3c28d85 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 @@ -98,14 +98,19 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysPosition(SysPosition position){ - DdlPackBean result = new DdlPackBean(); + return packHqlSysPosition(position,null); + } + public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){ + DdlPackBean result = new DdlPackBean(); // 查询参数封装 DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); - DdlPreparedPack.getStringEqualPack(position.getName(),"name",result); - DdlPreparedPack.getStringEqualPack(position.getPositionCode(),"positionCode",result); - DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); + // String Like + DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); + // In + DdlPreparedPack.getInPackList(idList,"id",result); return result; } @@ -217,6 +222,7 @@ public class CoreHqlPack { * @param role * @return */ + @Deprecated public static String packHqlSysRole(SysRole role){ StringBuffer result = new StringBuffer(); @@ -231,6 +237,27 @@ public class CoreHqlPack { } /** + * 系统角色复杂查询 + * @param role + * @return + */ + public static DdlPackBean packDdlBeanSysRole(SysRole role){ + return packDdlBeanSysRole(role,null); + } + + public static DdlPackBean packDdlBeanSysRole(SysRole role,List idList){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); + DdlPreparedPack.getStringLikerPack(role.getName(),"name",result); + DdlPreparedPack.getInPackList(idList,"id",result); + + return result; + } + + /** * 系统参数复杂查询 * @param config * @return @@ -797,6 +824,19 @@ public class CoreHqlPack { return ddlPackBean; } + public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){ + DdlPackBean result = new DdlPackBean(); + + // Number Eq + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result); + // String Eq + DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result); + + return result; + } + /** * 查询当前用户所有组织数据 * @param sysRefUserDepartments From 1b1bc67c90840e7e42384ad717aeeac01158ec97 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 10:15:54 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 156a405..5a5a836 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -247,7 +247,9 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_TYPE { - USER(1, "user", "普通用户"), ADMIN(2, "admin", "系统管理员"), SA(3, "sa", "超级管理员"); + USER(1, "user", "普通用户"), + ADMIN(2, "admin", "系统管理员"), + SA(3, "sa", "超级管理员"); private int value; private String code; From b2866c85dd6c4f2ee2a9d7727574c21402bce9b5 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Fri, 5 Jul 2019 10:49:11 +0800 Subject: [PATCH 07/16] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 281f442..15184c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -807,6 +807,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + getStringBuilderPack(wmsStockSn, result); return result; From a1a77b63db3e19f731afc2ceb67495bd6a2b6fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 5 Jul 2019 13:34:27 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E3=80=81=E6=98=AF=E5=90=A6=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=89=B9=E6=AC=A1=E3=80=82=20POJO=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=B5=8B=E5=80=BC2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 0c1b599..e25c770 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -141,7 +141,7 @@ public class WmsPart extends BaseBean { @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - private String outCloseFlag; + private String outCloseFlag = "2"; @Transient @ApiParam("总数量") @@ -153,7 +153,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_PROD_LOT") @ApiParam(value = "是否录入生产批次", example = "1") - private Integer isProdLot; + private Integer isProdLot = 2; public int getIqcValue(){ return this.iqc == null ? 0 : this.iqc.intValue(); From 78cd5dc77efb78b9caac8c0cffdfc2bd61961630 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 14:14:25 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 5a5a836..b6d4ef7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -283,6 +283,26 @@ public class CommonEnumUtil { return tmp; } + public static USER_TYPE valueOfCode(String code) { + USER_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static USER_TYPE valueOfDescription(String description) { + USER_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i]; + } + } + return tmp; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { From 0041ce328eb48911c40b299e458061851074d36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 5 Jul 2019 14:20:15 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/tool/BsonPackTool.java | 65 ++++++++++++++++++++- .../cn/estsh/i3plus/pojo/base/util/BaseRedis.java | 9 +++ .../pojo/platform/bean/SysLocaleResource.java | 4 +- .../i3plus/pojo/platform/sqlpack/CoreBsonPack.java | 68 +++++++++++++--------- 4 files changed, 117 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java index 607427d..98dcfd7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java @@ -109,7 +109,6 @@ public class BsonPackTool { return list; } - /** * 封装日期 * @param startDate 开始日期 @@ -161,7 +160,7 @@ public class BsonPackTool { * @param showToday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 * @param isShowTime 是否包含时分秒 */ - public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showToday,boolean isShowTime) { + public static Bson timeBuilder( String date, String columnName, Bson bson, boolean showToday,boolean isShowTime) { if(date != null && !"null".equals(date) && date.trim().length() > 0){ date = getSafeParam(date); @@ -249,6 +248,68 @@ public class BsonPackTool { } /** + * 大于日期 + * @param dateTime 日期 + * @param columnName HQL里对应的时间字段 + * @param bson 封装的bson + * @param isShowTime 是否包含时分秒 + */ + public static Bson timeMore( String dateTime, String columnName, Bson bson, boolean isShowTime) { + if (dateTime == null || dateTime.trim().length() == 0) { + dateTime = "1900-01-01"; + } else { + dateTime = getSafeParam(dateTime); + dateTime = dateTime.trim(); + } + if (isShowTime && dateTime.trim().length()<=11) { + dateTime+= " 00:00:00"; + } + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, dateTime) //大于等于开始日期 + ); + }else{ + bson = Filters.and( + bson, + Filters.gte(columnName, dateTime) //大于等于开始日期 + ); + } + + return bson; + } + + /** + * 小于日期 + * @param dateTime 日期 + * @param columnName HQL里对应的时间字段 + * @param bson 封装的bson + * @param isShowTime 是否包含时分秒 + */ + public static Bson timeLess( String dateTime, String columnName, Bson bson, boolean isShowTime) { + if (dateTime == null || dateTime.trim().length() == 0) { + dateTime = "2100-01-01"; + } else { + dateTime = getSafeParam(dateTime); + dateTime = dateTime.trim(); + } + if (isShowTime&& dateTime.trim().length()<=11) { + dateTime+= " 23:59:59"; + } + if(bson == null) { + bson = Filters.and( + Filters.lte(columnName, dateTime) //小于等于结束日期 + ); + }else{ + bson = Filters.and( + bson, + Filters.lte(columnName, dateTime) //小于等于结束日期 + ); + } + + return bson; + } + + /** * 封装String对象成like语句 * @param str 对象值 * @param columnName 列名 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java index f0fb196..21f56a3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java @@ -50,6 +50,15 @@ public interface BaseRedis { Object getObject(Object key); /** + * 普通缓存获取 + * @param key 键 + * @param start 开始 + * @param end 结束 0 到 -1代表所有值 + * @return 值 + */ + Object getObject(Object key, long start, long end); + + /** * 普通缓存放入 * @param key 键 * @param value 值 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 81adc82..1a6f01a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; @@ -55,7 +56,8 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") private String resourceKey; - @Column(name="resource_value",columnDefinition="TEXT") + @Lob + @Column(name="resource_value") @ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取") private String resourceValue; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java index c4bedb4..9e7722d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.sqlpack; import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; @@ -19,82 +20,97 @@ public class CoreBsonPack { /** * 日志复杂查询 + * * @param logSystem * @return */ - public static Bson packBsonByLogSystem(SysLogSystem logSystem){ + public static Bson packBsonByLogSystem(SysLogSystem logSystem) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(),"logLevel",bson); - bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(),"logModuleId",bson); - bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(),"createDatetime",bson,false,false); - bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(),"remoteIp",bson); - bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(),"requestUrl",bson); - bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(),"logMethod",bson); + bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson); + bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson); + bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(), "createDatetime", bson, false, false); + bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson); + bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson); + bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson); return bson; } /** * 系统操作日志 + * * @param logOperate * @return */ - public static Bson packBsonByLogOperate(SysLogOperate logOperate){ + public static Bson packBsonByLogOperate(SysLogOperate logOperate) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(),"operateType",bson); - bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(),"operateModule",bson); - bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(),"createDatetime",bson,false,false); - bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(),"remoteIp",bson); - bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(),"operateMessage",bson); - bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson); + bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson); + bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson); + bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false); + bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson); + bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson); + bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson); return bson; } /** * 系统异常日志复杂查询 + * * @param sysLogException * @return */ - public static Bson packBsonBySysLogException(SysLogException sysLogException){ + public static Bson packBsonBySysLogException(SysLogException sysLogException) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(),"excModule",bson); - bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(),"excMessage",bson); - bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(),"createDatetime",bson,false,false); + bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson); + bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson); + bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false); return bson; } /** * 定时任务日志复杂查询 + * * @param sysLogTaskTime * @return */ - public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime){ + public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(),"name",bson); - bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(),"groupName",bson); - bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(),"createDatetime",bson,false,false); + bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson); + bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson); + bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(), "createDatetime", bson, false, false); return bson; } /** * 区间 + * * @param colName * @param min * @param max * @return */ - public static Bson packBsonByInterval(String colName,Object min,Object max){ + public static Bson packBsonByInterval(String colName, Object min, Object max) { Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumBiggerPack(min,colName,bson); - bson = BsonPackTool.getNumSmallerPack(max,colName,bson); + bson = BsonPackTool.getNumBiggerPack(min, colName, bson); + bson = BsonPackTool.getNumSmallerPack(max, colName, bson); return bson; - }} + } + + /** + * 指定日期之后 + * @param dateTime 日期 + * @return + */ + public static Bson packBsonByDateTimeAfter(String dateTime){ + return BsonPackTool.timeLess(dateTime, "createDatetime", null, true); + } +} From 8a5a7c23ca0f9c4a81e1882e72a25ae1bed2236e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 5 Jul 2019 14:22:13 +0800 Subject: [PATCH 11/16] =?UTF-8?q?andonPLC=20MQ=20=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonManageQueue.java | 20 ++++++++++++++++ .../cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 7 ++++++ .../sqlpack/AndonHqlPack.java | 27 ++++++++++++++++++---- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index cfd9634..de3e10a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -7,10 +7,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.beanutils.BeanUtils; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; import java.util.List; /** @@ -394,4 +397,21 @@ public class AndonManageQueue extends BaseBean { public AndonManageQueue() { } + + public static void main(String[] args) { + try { + List ds = new ArrayList(); + ds.add(new AndonManageQueue()); + + + + System.out.println(BeanUtils.describe(ds)); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java index 220d4a5..4d6bca8 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -75,4 +75,11 @@ public class AndonPLC extends BaseBean { @Column(name = "IS_ALARM_STATUS") @ApiParam(value = "是否按灯状态", example = "1") private Integer isAlarmStatus; + + public int getIsAlarmStatusVal(){ + if(isAlarmStatus == null){ + return 0; + } + return isAlarmStatus.intValue(); + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 902b0bc..d21e6d6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -196,15 +196,15 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result); DdlPreparedPack.getInPackArray(obj, "statusCode", result); - getStringBuilderPack(andonManageQueue, result); - - if(andonManageQueue.getCallTimeStart() != null || andonManageQueue.getCallTimeEnd() != null){ + if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){ DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); } + getStringBuilderPack(andonManageQueue, result); // 根据优先级倒序，序号升序排序 - DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, - new String[]{"priorityLevel", "seq"}, result); +// DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, +// new String[]{"priorityLevel", "seq"}, result); + result.setOrderByStr(andonManageQueue.orderBy()); return result; } @@ -418,6 +418,23 @@ public class AndonHqlPack { return result; } + + /** + * 模糊查询安灯子类型信息 + * @param andonAlarmDetailType + * @return + */ + public static DdlPackBean packAndonAlarmDetailTypeLike(AndonAlarmDetailType andonAlarmDetailType) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmDetailType.getAlarmDetailName(), "alarmDetailName", result); + + getStringBuilderPack(andonAlarmDetailType, result); + + return result; + } // // /** // * 安灯类型查询条件封装 From cf7957525a436a5e12e2eddae0e95c97389fa809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 5 Jul 2019 16:00:05 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java index 6864439..6dfc40a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java @@ -42,19 +42,19 @@ public class SapCyco extends SapBase{ @ApiParam(value = "库存状态") @AnnoOutputColumn - private String zstat; + private String zstat=""; @ApiParam(value = "特殊库存标识") @AnnoOutputColumn - private String sobkz; + private String sobkz=""; @ApiParam(value = "项目号") @AnnoOutputColumn - private String zxm; + private String zxm=""; @ApiParam(value = "库存账冻结标志") @AnnoOutputColumn - private String zdjbs; + private String zdjbs=""; @ApiParam(value = "删除标识") @AnnoOutputColumn From 3a19888ddf8757bac0be5452e59d2dbed5fc25f5 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 17:01:17 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=20=E5=B2=97=E4=BD=8D=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 18 ++++++++++++++++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 5fe7b1e..52f3324 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.base.bean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; + import java.util.HashMap; /** @@ -49,6 +52,21 @@ public class DdlPackBean { hqlPreparedMap = new HashMap<>(); } + /** + * 查询制定组织有效的数据 + * @param organizeCode + * @return + */ + public static DdlPackBean getDdlPackBean(String organizeCode){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + + return result; + } + public boolean isHql() { return isHql; } 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 3c28d85..a80ea62 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 @@ -102,10 +102,10 @@ public class CoreHqlPack { } public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode()); // 查询参数封装 - DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); +// DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); // String Like DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); From c858475bd24b93fc5f0b8fa7ebfc473f958d3559 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 19:56:10 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 9 +++++++++ .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 52f3324..02c6274 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -67,6 +67,15 @@ public class DdlPackBean { return result; } + public static DdlPackBean getDdlPackBean(){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + + return result; + } + public boolean isHql() { return isHql; } 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 a80ea62..43e4101 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 @@ -196,6 +196,17 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result); + DdlPreparedPack.getInPackList(idList,"id",result); + + result.setOrderByStr(department.orderBy()); + return result; + } + /** * 系统权限复杂查询 * @param menu From be78ed2636eb7cb8e589d8b304008ff4cd74144d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 22:01:42 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=80=E5=B8=90=E5=8F=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 2 +- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index aa214c0..af22709 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -144,7 +144,7 @@ public class SysUser extends BaseBean { @Transient @ApiParam(value ="角色ID" , example = "0") @JsonSerialize(using = ToStringSerializer.class) - private String roleId; + private Long roleId; @Transient @ApiParam(value ="角色ID集合" , example = "0") 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 43e4101..84eef50 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 @@ -470,6 +470,21 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysUser(SysUser user,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"",result); + DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + + DdlPreparedPack.getInPackList(idList,"id",result); + result.setOrderByStr(user.orderBy()); + + return result; + } + /** * 账号复杂查询 * @param user @@ -848,6 +863,21 @@ public class CoreHqlPack { return result; } + public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + // Number Eq + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + DdlPreparedPack.getNumEqualPack(userId,"userId",result); + DdlPreparedPack.getNumEqualPack(roleId,"roleId",result); + + // String Eq + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + + return result; + } + /** * 查询当前用户所有组织数据 * @param sysRefUserDepartments From 2aa2dca77f0affe56e18544ed443793aedaa9df1 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Sat, 6 Jul 2019 00:25:18 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) 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 84eef50..c24d5f5 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 @@ -228,6 +228,21 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); + DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + + result.setOrderByStr(menu.orderBy()); + + return result; + } + /** * 系统角色复杂查询 * @param role @@ -474,7 +489,7 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); @@ -592,6 +607,25 @@ public class CoreHqlPack { return result.toString(); } + public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List idList){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + // And + DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); + DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); + DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getInPackList(idList,"id",result); + + // Like + DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + + // 添加默认排序 + result.setOrderByStr(userInfo.orderBy()); + + return result; + } + /** * 用户信息 复杂查询拼接 * @param userInfo