From 74a0ec1ec31b5e591e2fd95c10e7b0c1e08429a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 20 May 2025 14:19:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E9=A1=B9=E6=A0=A1=E9=AA=8C=E6=B3=A8=E8=A7=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=9A=94=E7=AC=A6=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/service/DictService.java      |  9 ---------
 .../core/validate/dicts/DictPattern.java      |  5 +++++
 .../validate/dicts/DictPatternValidator.java  | 15 +++++++++++++-
 .../service/impl/SysDictTypeServiceImpl.java  | 20 -------------------
 4 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java
index fc33f1e35..d80395cc8 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java
@@ -84,13 +84,4 @@ public interface DictService {
      */
     List<DictDataDTO> getDictData(String dictType);
 
-    /**
-     * 校验指定的字典类型下是否存在指定的字典值
-     *
-     * @param dictType  字典类型
-     * @param dictValue 字典值
-     * @return true 表示该字典值在指定字典类型中有效；false 表示无效
-     */
-    Boolean isValidDictValue(String dictType, String dictValue);
-
 }
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java
index d5199873d..73fc4c444 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java
@@ -23,6 +23,11 @@ public @interface DictPattern {
      */
     String dictType();
 
+    /**
+     * 分隔符
+     */
+    String separator();
+
     /**
      * 默认校验失败提示信息
      */
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java
index 734975aea..558a3438a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java
@@ -4,6 +4,7 @@ import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 import org.dromara.common.core.service.DictService;
 import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
 
 /**
  * 自定义字典值校验器
@@ -17,6 +18,11 @@ public class DictPatternValidator implements ConstraintValidator<DictPattern, St
      */
     private String dictType;
 
+    /**
+     * 分隔符
+     */
+    private String separator = ",";
+
     /**
      * 初始化校验器，提取注解上的字典类型
      *
@@ -25,6 +31,9 @@ public class DictPatternValidator implements ConstraintValidator<DictPattern, St
     @Override
     public void initialize(DictPattern annotation) {
         this.dictType = annotation.dictType();
+        if (StringUtils.isNotBlank(annotation.separator())) {
+            this.separator = annotation.separator();
+        }
     }
 
     /**
@@ -36,7 +45,11 @@ public class DictPatternValidator implements ConstraintValidator<DictPattern, St
      */
     @Override
     public boolean isValid(String value, ConstraintValidatorContext context) {
-        return SpringUtils.getBean(DictService.class).isValidDictValue(dictType, value);
+        if (StringUtils.isBlank(dictType) || StringUtils.isBlank(value)) {
+            return false;
+        }
+        String dictLabel = SpringUtils.getBean(DictService.class).getDictLabel(dictType, value, separator);
+        return StringUtils.isNotBlank(dictLabel);
     }
 
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
index 7eaea5563..c417b42ca 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
@@ -294,24 +294,4 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
         return BeanUtil.copyToList(list, DictDataDTO.class);
     }
 
-    /**
-     * 校验指定的字典类型下是否存在指定的字典值
-     *
-     * @param dictType  字典类型
-     * @param dictValue 字典值
-     * @return true 表示该字典值在指定字典类型中有效；false 表示无效
-     */
-    @Override
-    public Boolean isValidDictValue(String dictType, String dictValue) {
-        if (StringUtils.isBlank(dictType) || StringUtils.isBlank(dictValue)) {
-            return false;
-        }
-        List<SysDictDataVo> datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
-        if (CollUtil.isEmpty(datas)) {
-            return false;
-        }
-        Map<String, String> map = StreamUtils.toMap(datas, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel);
-        return map.containsKey(dictValue);
-    }
-
 }