From 6f7bb3cbeae973956a88156276362ac08e1c1290 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Fri, 29 Nov 2024 10:16:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=85=83=E6=95=B0=E6=8D=AE=E9=81=8D=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meta/parser/BeanPropertyAnnotations.java  | 12 +++++++
 .../parser/SimpleBeanPropertyAnnotations.java | 34 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java
index 5500416..ffb6d46 100644
--- a/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java
+++ b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java
@@ -74,6 +74,18 @@ public interface BeanPropertyAnnotations {
     <A extends Annotation, L extends Annotation> BeanPropertyAnnotationBatchChain<A, MergedAnnotation<A>> as(
             Class<A> annotationType, Class<L> listType);
 
+    /**
+     * 判断某个注解是否存在，存在则交给consumer进行处理，取得所有注解并自动判断复数形式
+     *
+     * @param annotationType 注解类型
+     * @param listType       列表类型
+     * @param <A>            泛型
+     * @param <L>            列表泛型
+     * @return 结果
+     */
+    <A extends Annotation, L extends Annotation> BeanPropertyAnnotationBatchChain<A, MergedAnnotation<A>> as(
+            String annotationType, String listType);
+
     /**
      * 设置上一步结果
      *
diff --git a/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java
index f1ede48..90f4c4e 100644
--- a/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java
+++ b/flyfish-bean/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java
@@ -13,6 +13,7 @@ import org.springframework.util.CollectionUtils;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -127,6 +128,39 @@ public class SimpleBeanPropertyAnnotations implements BeanPropertyAnnotations {
         return batchEmpty();
     }
 
+    /**
+     * 判断某个注解是否存在，存在则交给consumer进行处理，取得所有注解并自动判断复数形式
+     *
+     * @param annotationType 注解类型
+     * @param listType       列表类型
+     * @return 结果
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public <A extends Annotation, L extends Annotation> BeanPropertyAnnotationBatchChain<A, MergedAnnotation<A>> as(String annotationType, String listType) {
+        if (null != field && !this.last) {
+            MergedAnnotation<L> annotation = this.annotations.get(listType);
+            // 存在注解容器，读取之
+            if (annotation.isPresent()) {
+                List<MergedAnnotation<A>> picked = annotation.getValue("value")
+                        .map(value -> Arrays.asList((MergedAnnotation<A>[]) value))
+                        .orElse(Collections.emptyList());
+                if (!CollectionUtils.isEmpty(picked)) {
+                    return new SimpleAnnotationBatchChain<>(this.last(true), picked);
+                }
+            }
+            // 不存在或为空，查找直接注解的（大多数是一个）
+            List<MergedAnnotation<A>> values = this.annotations.<A>stream(annotationType)
+                    .filter(MergedAnnotation::isPresent)
+                    .collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(values)) {
+                return new SimpleAnnotationBatchChain<>(this.last(true), values);
+            }
+        }
+        // 啥也没，返回空
+        return batchEmpty();
+    }
+
     /**
      * 设置上一步结果
      *