admin/easy-es
1
0
Fork 0
mirror of https://gitee.com/dromara/easy-es.git synced 2025-12-06 17:18:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

v2.0.0-beta5

Browse Source 
索引创建时嵌套类型中,无需序列化字段被序列化问题修复
This commit is contained in:
xpc 2024-01-20 15:01:11 +08:00
parent 88095f5e88
commit 7839bed247
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
easy-es-core/src/main/java/org/dromara/easyes/core/toolkit/EntityInfoHelper.java
View File

@ -427,6 +427,15 @@ public class EntityInfoHelper {
}
}
/**
* 添加高亮参数
*
* @param entityInfo 实体信息
* @param nestedClass 嵌套类
* @param highLight 高亮注解
* @param realHighLightField 实际高亮字段
* @param mappingField 映射字段
*/
private static void addHighlightParam(EntityInfo entityInfo, Class<?> nestedClass, HighLight highLight,
String realHighLightField, String mappingField) {
if (nestedClass == null) {
@ -477,11 +486,23 @@ public class EntityInfoHelper {
allFields.forEach(field -> {
String mappingColumn;
FieldType fieldType;
// 初始化封装嵌套类中的HighLight注解信息
if (field.isAnnotationPresent(HighLight.class)) {
initHighLightAnnotation(dbConfig, entityInfo, field, mappingColumnMap, nestedClass);
}
// 处理TableField注解
MultiIndexField multiIndexField = field.getAnnotation(MultiIndexField.class);
IndexField indexField = Optional.ofNullable(multiIndexField).map(MultiIndexField::mainIndexField)
.orElse(field.getAnnotation(IndexField.class));
if (Objects.isNull(indexField)) {
// 跳过无关字段
Set<String> notSerializeFields = Optional.ofNullable(entityInfo.getNestedNotSerializeField().get(nestedClass)).orElse(Collections.emptySet());
if (notSerializeFields.contains(field.getName())) {
return;
}
mappingColumn = getMappingColumn(dbConfig, field);
EntityFieldInfo entityFieldInfo = new EntityFieldInfo(dbConfig, field);
entityFieldInfo.setMappingColumn(mappingColumn);
@ -546,10 +567,7 @@ public class EntityInfoHelper {
mappingColumnMap.putIfAbsent(field.getName(), mappingColumn);
fieldTypeMap.putIfAbsent(field.getName(), fieldType.getType());
// 初始化封装嵌套类中的HighLight注解信息
if (field.isAnnotationPresent(HighLight.class)) {
initHighLightAnnotation(dbConfig, entityInfo, field, mappingColumnMap, nestedClass);
}
});
entityInfo.getNestedNotSerializeField().putIfAbsent(nestedClass, notSerializedFields);
entityInfo.getNestedClassColumnMappingMap().putIfAbsent(nestedClass, columnMappingMap);