refactor(utils):优化字段映射逻辑- 将字段流合并逻辑提取到独立方法listFields中

- 简化convertValue方法中的字段处理流程 - 提高代码可读性和维护性

refactor(utils):优化字段映射逻辑- 将字段流合并逻辑提取到独立方法listFields中
- 简化convertValue方法中的字段处理流程 - 提高代码可读性和维护性
zhangmeiyang
1 parent 11d663aa
Showing 1 changed file with 3 additions and 6 deletions
tax-central/src/main/java/com/diligrp/tax/central/utils/MappingUtils.java
@@ -64,12 +64,9 @@ public class MappingUtils {
     public static <T extends BaseDocument, R extends BaseMapping> R convertValue(T t, Class<R> clazz) {
         Map<String, Object> map = new HashMap<>();
-        Field[] allFields = Stream.concat(
-                Arrays.stream(t.getClass().getDeclaredFields()),
-                Arrays.stream(t.getClass().getSuperclass().getDeclaredFields())
-        ).toArray(Field[]::new);
-        Arrays.stream(allFields).filter(field -> field.isAnnotationPresent(Converter.class)).forEach(field -> configureField(t, field, map));
-        Arrays.stream(allFields).filter(field -> field.isAnnotationPresent(SubConverter.class)).forEach(field -> configureSubField(t, field, map));
+        List<Field> allFields = listFields(t.getClass());
+        allFields.stream().filter(field -> field.isAnnotationPresent(Converter.class)).forEach(field -> configureField(t, field, map));
+        allFields.stream().filter(field -> field.isAnnotationPresent(SubConverter.class)).forEach(field -> configureSubField(t, field, map));
         return JsonUtils.convertValue(map, clazz);
     }