添加字典分组

优化redis资源键

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -1152,4 +1152,39 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+
+    /**
+     * 字典分组
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DICTIONARY_GROUP {
+        SYSTEM(1, "系统字典"),
+        EXTERNAL(2, "外部人员");
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private DICTIONARY_GROUP(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java

@@ -45,6 +45,11 @@ public class SysDictionary extends BaseBean {
     @ApiParam(value ="字典所属模块")
     private Integer dictionarySoftType;
 
+    //枚举 ImppEnumUtil.DICTIONARY_GROUP
+    @Column(name="DICTIONARY_GROUP")
+    @ApiParam(value ="字典分组")
+    private Integer dictionaryGroup;
+
     // 根节点-1
     @Column(name="PARENT_ID")
     @ApiParam(value ="父节点" , example = "-1")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -316,24 +316,24 @@ public class CoreHqlPack {
      * @param dictionary
      * @return
      */
-    public static String packHqlSysDictionary(SysDictionary dictionary) {
+    public static DdlPackBean packHqlSysDictionaryPage(SysDictionary dictionary) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
 
         // hql拼接
-        HqlPack.getStringLikerPack(dictionary.getName(), "name", result);
+        DdlPreparedPack.getStringLikerPack(dictionary.getName(), "name", result);
-        HqlPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result);
+        DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result);
-        HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
+        DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
         // 默认查询非顶级字典
         if (dictionary.getParentId() == null || dictionary.getParentId() < 1){
-            HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
+            DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
         }
-        HqlPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
+        DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
-        HqlPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result);
+        DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result);
 
         // 添加默认排序
-        HqlPack.getOrderDefault(dictionary);
+        DdlPreparedPack.getOrderDefault(dictionary);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -550,20 +550,20 @@ public class CoreHqlPack {
      * @param dictionary
      * @return
      */
-    public static String packHqlSysDictionaryCode(SysDictionary dictionary){
+    public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary){
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
 
         // and
-        HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
+        DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
-        HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
+        DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
-        HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result);
+        DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result);
         // not
-        HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
+        DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result);
 
         // 添加默认排序
-        HqlPack.getOrderDefault(dictionary);
+        DdlPreparedPack.getOrderDefault(dictionary);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -571,20 +571,20 @@ public class CoreHqlPack {
      * @param dictionary
      * @return
      */
-    public static String packHqlSysDictionaryValue(SysDictionary dictionary){
+    public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary){
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = new DdlPackBean();
 
         // and
-        HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
+        DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
-        HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
+        DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
-        HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result);
+        DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result);
         // not
-        HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
+        DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result);
 
         // 添加默认排序
-        HqlPack.getOrderDefault(dictionary);
+        DdlPreparedPack.getOrderDefault(dictionary);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -932,4 +932,22 @@ public class CoreHqlPack {
 
         return packBean;
     }
+
+    /**
+     * 按条件查询字典
+     * @param sysDictionary
+     * @return
+     */
+    public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){
+        DdlPackBean packBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean);
+        DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean);
+        DdlPreparedPack.getStringEqualPack(sysDictionary.getParentCodeRdd(), "parentCodeRdd", packBean);
+        DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean);
+        DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean);
+        DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean);
+
+        return packBean;
+    }
 }