Merge branch 'master' into test

sys-sdk/src/main/java/com/xy/utils/SysDictUtils.java

@@ -1,5 +1,7 @@
 package com.xy.utils;
 
+import com.xy.collections.map.JHashMap;
+import com.xy.collections.map.JMap;
 import com.xy.entity.SysDictRedis;
 
 import java.util.ArrayList;
@@ -77,7 +79,6 @@ public class SysDictUtils {
                 : (T) value;
     }
 
-
     /**
      * 获取所有字典
      *
@@ -87,7 +88,6 @@ public class SysDictUtils {
         return getRedisService().likeMap(SYS_DICT_REDIS_PREFIX);
     }
 
-
     /**
      * 根据label查字典
      *
@@ -95,6 +95,7 @@ public class SysDictUtils {
      * @param label
      * @return
      */
+    @Deprecated
     public static SysDictRedis getByLabel(String paterCode, String label) {
         Map<String, SysDictRedis> stringSysDictRedisMap = get(paterCode);
         SysDictRedis sysDict = new SysDictRedis();
@@ -107,4 +108,31 @@ public class SysDictUtils {
         }
         return sysDict;
     }
+
+    /**
+     * 根据值获取字典
+     *
+     * @param paterCode
+     * @param value
+     * @return
+     */
+    @Deprecated
+    public static SysDictRedis getByValue(String paterCode, String value) {
+        Map<String, SysDictRedis> stringSysDictRedisMap = get(paterCode);
+        JMap<String, SysDictRedis> jMap = new JHashMap<>(stringSysDictRedisMap).toList().value().toMap(SysDictRedis::getValue).cover();
+        return jMap.get(value);
+    }
+
+    /**
+     * 根据值获取字典
+     *
+     * @param paterCode
+     * @param value
+     * @return
+     */
+    @Deprecated
+    public static <T> T getByValue(String paterCode, String value, Class<T> tClass) {
+        SysDictRedis sysDictRedis = getByValue(paterCode, value);
+        return getValue(sysDictRedis.getPaterCode(), sysDictRedis.getCode(), tClass);
+    }
 }