From 79ad22229515ad1d66c96e40c4305850f0797975 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sat, 12 Jan 2019 15:53:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E5=8A=A0?= =?UTF-8?q?=E5=AF=86=E4=BE=A7=E7=8E=87=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 ++ .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 67 ++++++++++++++++++++++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 32 +++++------ .../pojo/model/platform/UserDetailModel.java | 1 + .../pojo/model/platform/UserDetailPagerModel.java | 19 ++++++ 5 files changed, 107 insertions(+), 16 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java 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 bac5406..dd1bcc0 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 @@ -114,6 +114,10 @@ public class CommonEnumUtil { return value; } + public String getValueStr() { + return value + ""; + } + public String getDescription() { return description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 464bf8f..328f3dc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -896,4 +896,71 @@ public class ImppEnumUtil { return tmp; } } + + /** + * 系统值类型 + * 1. String + * 2. Number + * 3. Date + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYS_CACHE_TYPE { + + REDIS(1,"Redis","Redis 缓存方式"); + + private int value; + private String name; + private String description; + + SYS_CACHE_TYPE() { + } + + SYS_CACHE_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 a867bba..f17eeea 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 @@ -941,12 +941,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username) { if(propValues != null && propValues.length > 0){ String hql = "update " + persistentClass.getName() - + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + + " model set model.isDeleted =:modelIsDeleted,model.modifyUser=:modelModifyUser,model.modifyDatetime=:modelModifyDatetime where model." + propName + " in(:"+propName+") "; Query query = entityManager.createQuery(hql); - query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - query.setParameter("modifyUser",username); - query.setParameter("modifyDatetime",getNowTime(true)); + query.setParameter("modelIsDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + query.setParameter("modelModifyUser",username); + query.setParameter("modelModifyDatetime",getNowTime(true)); query.setParameter(propName, Arrays.asList(propValues)); return query.executeUpdate(); @@ -963,12 +963,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int deleteWeaklyByProperties(String[] propName, Object[] propValue,String username) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("update " + persistentClass.getName() - + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 "); + + " model set model.isDeleted = :modelDeleted,model.modifyUser= :modelModifyUser,model.modifyDatetime=:modelModifyDatetime where 1=1 "); appendQL(sb,propName,propValue); Query query = entityManager.createQuery(sb.toString()); - query.setParameter("modifyUser",username); - query.setParameter("modifyDatetime",getNowTime(true)); - query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + query.setParameter("modelModifyUser",username); + query.setParameter("modelModifyDatetime",getNowTime(true)); + query.setParameter("modelDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); setParameter(query,propName,propValue); @@ -1001,12 +1001,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username) { if(propValues != null && propValues.length > 0){ String hql = "update " + persistentClass.getName() - + " model set model.isValid = :isValid ,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + + " model set model.isValid =:modelIsValid ,model.modifyUser=:modelModifyUser,model.modifyDatetime=:modelModifyDatetime where model." + propName + " in(:"+propName+") "; Query query = entityManager.createQuery(hql); - query.setParameter("modifyUser",username); - query.setParameter("modifyDatetime",getNowTime(true)); - query.setParameter("isValid",status); + query.setParameter("modelModifyUser",username); + query.setParameter("modelModifyDatetime",getNowTime(true)); + query.setParameter("modelIsValid",status); query.setParameter(propName, Arrays.asList(propValues)); return query.executeUpdate(); @@ -1023,12 +1023,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int updateValidStatusByProperties(String[] propName, Object[] propValue,int status,String username) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("update " + persistentClass.getName() - + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 "); + + " model set model.isValid = :modelIsValid,model.modifyUser= :modelModifyUser,model.modifyDatetime=:modelModifyDatetime where 1=1 "); appendQL(sb,propName,propValue); Query query = entityManager.createQuery(sb.toString()); - query.setParameter("modifyUser",username); - query.setParameter("modifyDatetime",getNowTime(true)); - query.setParameter("isValid",status); + query.setParameter("modelModifyUser",username); + query.setParameter("modelModifyDatetime",getNowTime(true)); + query.setParameter("modelIsValid",status); setParameter(query,propName,propValue); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 4df40f1..5ff8bed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.platform; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java new file mode 100644 index 0000000..80c430e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-01-10 13:52 + * @Modify: + **/ +@Data +public class UserDetailPagerModel { + + private UserDetailModel userDetailModel; + + private Pager pager; +}