diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/DictField.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/DictModel.java similarity index 95% rename from continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/DictField.java rename to continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/DictModel.java index d2c5b21f..0690c249 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/DictField.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/annotation/DictModel.java @@ -19,7 +19,7 @@ package top.continew.starter.extension.crud.annotation; import java.lang.annotation.*; /** - * 字典结构字段 + * 字典结构映射 * * @author Charles7c * @since 2.1.0 @@ -27,7 +27,7 @@ import java.lang.annotation.*; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface DictField { +public @interface DictModel { /** * 标签字段名 diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java index 7a2e83f0..cf94c997 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseServiceImpl.java @@ -42,7 +42,8 @@ import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.data.mp.service.impl.ServiceImpl; import top.continew.starter.data.mp.util.QueryWrapperHelper; -import top.continew.starter.extension.crud.annotation.DictField; +import top.continew.starter.extension.crud.annotation.DictModel; +import top.continew.starter.extension.crud.annotation.DictModel; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.extension.crud.autoconfigure.CrudProperties; import top.continew.starter.extension.crud.autoconfigure.CrudTreeProperties; @@ -138,18 +139,18 @@ public abstract class BaseServiceImpl, T extends BaseIdD @Override public List listDict(Q query, SortQuery sortQuery) { - DictField dictField = super.getEntityClass().getDeclaredAnnotation(DictField.class); - CheckUtils.throwIfNull(dictField, "请添加并配置 @DictField 字典结构信息"); + DictModel dictModel = super.getEntityClass().getDeclaredAnnotation(DictModel.class); + CheckUtils.throwIfNull(dictModel, "请添加并配置 @DictModel 字典结构信息"); List list = this.list(query, sortQuery); // 解析映射 List respList = new ArrayList<>(list.size()); - String labelKey = dictField.labelKey().contains(StringConstants.DOT) - ? CharSequenceUtil.subAfter(dictField.labelKey(), StringConstants.DOT, true) - : dictField.labelKey(); - String valueKey = dictField.valueKey().contains(StringConstants.DOT) - ? CharSequenceUtil.subAfter(dictField.valueKey(), StringConstants.DOT, true) - : dictField.valueKey(); - List extraFieldNames = Arrays.stream(dictField.extraKeys()) + String labelKey = dictModel.labelKey().contains(StringConstants.DOT) + ? CharSequenceUtil.subAfter(dictModel.labelKey(), StringConstants.DOT, true) + : dictModel.labelKey(); + String valueKey = dictModel.valueKey().contains(StringConstants.DOT) + ? CharSequenceUtil.subAfter(dictModel.valueKey(), StringConstants.DOT, true) + : dictModel.valueKey(); + List extraFieldNames = Arrays.stream(dictModel.extraKeys()) .map(extraKey -> extraKey.contains(StringConstants.DOT) ? CharSequenceUtil.subAfter(extraKey, StringConstants.DOT, true) : extraKey) @@ -165,7 +166,7 @@ public abstract class BaseServiceImpl, T extends BaseIdD continue; } // 额外数据 - Map extraMap = MapUtil.newHashMap(dictField.extraKeys().length); + Map extraMap = MapUtil.newHashMap(dictModel.extraKeys().length); for (String extraFieldName : extraFieldNames) { extraMap.put(extraFieldName, ReflectUtil.getFieldValue(entity, extraFieldName)); }