From 4d322c0d872bfab067a88b682e11da8e1b454861 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 5 Nov 2018 18:14:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 6e44e58..8ccd621 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -89,11 +89,11 @@ public abstract class BaseBean implements Serializable { public transient String modifyDateTimeEnd; @ApiParam(value = "排序属性") - public transient String orderByParam; + public transient String orderByParam = ""; @ApiParam(value = "排序属性",example = "1") //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc - public transient int ascOrDesc; + public transient int ascOrDesc = 1; //排序方式 public String orderBy(){ @@ -109,7 +109,4 @@ public abstract class BaseBean implements Serializable { return result; } - public String getOrderByParam() { - return this.orderByParam == null ? "" : this.orderByParam; - } } From bef9c86454abc9a3fe07beadd5affe6e5e5a01f0 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 6 Nov 2018 13:12:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 7582a6b..da0fd4a 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -31,6 +31,10 @@ com.alibaba fastjson + + com.alibaba + fastjson + From 1b0a4101083dfed82dbf3d681e1551f462da2429 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 6 Nov 2018 16:06:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99?= 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 | 1 + 1 file changed, 1 insertion(+) 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 8009e30..2e30a3b 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 @@ -100,6 +100,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 + HqlPack.getNumEqualPack(wmsTransType.getIsValid(),"isValid",result); HqlPack.getStringLikerPack(wmsTransType.getTransCode(),"transCode",result); HqlPack.getStringLikerPack(wmsTransType.getTransName(),"transName",result); From bbe6b4f5442d3d54f7e9945c09878fe9880670c5 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 6 Nov 2018 17:29:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Base=20Repository=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 4 ++-- .../cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java | 7 +++++++ .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 11 ++++++++--- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java | 2 -- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 8ccd621..40a7d22 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -56,11 +56,11 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "有效性",example = "1") public Integer isValid; //EnumUtil.isValid; - @Column(name="create_user") + @Column(name="create_user",updatable = false) @ApiParam(value = "创建用户") public String createUser; - @Column(name="create_date") + @Column(name="create_date",updatable = false) @ApiParam(value = "创建日期") public String createDatetime; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 96c9529..8c98c20 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -83,6 +83,13 @@ public interface BaseRepository extends JpaReposito public void deleteByIds(Long[] ids); /** + * 批量删除 指定列名 + * @param propName + * @param ids + */ + public void deleteByTypeLong(String propName, Long[] ids); + + /** * 通过多单属性进行单个值更新 * @param conditionName * @param conditionValue diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 6768a89..a52e183 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -145,14 +145,19 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public void deleteByIds(Long[] ids) { - if(ids != null && ids.length > 0){ - String hql = "delete from " + persistentClass.getName() + " model where model.id in(:ids) "; + deleteByTypeLong("id", ids); + } + + @Override + public void deleteByTypeLong(String propName, Long[] ids) { + if ((propName != null && propName.length() > 0) && (ids != null && ids.length > 0)) { + String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:ids) "; Query query = entityManager.createQuery(hql); query.setParameter("ids", Arrays.asList(ids)); query.executeUpdate(); }else{ - throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! ids:" + ids); + throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! "+propName+":" + ids); } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index db5a166..283c823 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -77,6 +77,4 @@ public class SysRole extends BaseBean { @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1") private Integer roleStatusId; - - } From bd0c104431f319b7aaf846548b04f0d33c0bd77b Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 6 Nov 2018 17:55:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86=20=20?= =?UTF-8?q?=20=20=20=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=20=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=20get=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=88=A4=E6=96=AD=20=E7=A1=AC=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=20=20=20=20=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/common/PagerHelper.java | 3 +++ .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 8f574cc..692e9ff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -43,6 +43,9 @@ public class PagerHelper { } private static Pager getPager(int pageSize, int currentPage, int totalRows) { + // TODO 10可用系统参数替换 + pageSize = pageSize == 0 ? 10 : pageSize; + Pager pager = new Pager(); pager.setPageSize(pageSize); pager.setTotalRows(totalRows); 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 dc5588b..3214b6b 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.platform.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; @@ -172,6 +173,10 @@ public class CoreHqlPack { // hql拼接 HqlPack.getStringLikerPack(sysDictionary.getName(),"name",result); HqlPack.getStringLikerPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result); + // 默认查询非顶级字典 + if(sysDictionary.getParentId() == null || sysDictionary.getParentId() < 1){ + HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(),"parentId",result); + } HqlPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",result); return result.toString(); @@ -301,4 +306,15 @@ public class CoreHqlPack { return result.toString(); } + public static String packHqlSysDictionaryCode(SysDictionary sysDictionary){ + StringBuffer result = new StringBuffer(); + + // and + HqlPack.getStringEqualPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result); + // not + HqlPack.getNumNOEqualPack(sysDictionary.getId(),"id",result); + + return result.toString(); + } + } \ No newline at end of file