用户密码加密侧率功能完成

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;
         }

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;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -941,12 +941,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> 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("modelIsDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
-            query.setParameter("modifyUser",username);
+            query.setParameter("modelModifyUser",username);
-            query.setParameter("modifyDatetime",getNowTime(true));
+            query.setParameter("modelModifyDatetime",getNowTime(true));
             query.setParameter(propName, Arrays.asList(propValues));
 
             return query.executeUpdate();
@@ -963,12 +963,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> 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("modelModifyUser",username);
-            query.setParameter("modifyDatetime",getNowTime(true));
+            query.setParameter("modelModifyDatetime",getNowTime(true));
-            query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+            query.setParameter("modelDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
 
             setParameter(query,propName,propValue);
 
@@ -1001,12 +1001,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> 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("modelModifyUser",username);
-            query.setParameter("modifyDatetime",getNowTime(true));
+            query.setParameter("modelModifyDatetime",getNowTime(true));
-            query.setParameter("isValid",status);
+            query.setParameter("modelIsValid",status);
             query.setParameter(propName, Arrays.asList(propValues));
 
             return query.executeUpdate();
@@ -1023,12 +1023,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> 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("modelModifyUser",username);
-            query.setParameter("modifyDatetime",getNowTime(true));
+            query.setParameter("modelModifyDatetime",getNowTime(true));
-            query.setParameter("isValid",status);
+            query.setParameter("modelIsValid",status);
 
             setParameter(query,propName,propValue);
 

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;

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;
+}