suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(基础模块): 修复es查询返回array类型数据转换错误问题.

This commit is contained in:
zhouhao 2024-03-12 18:02:31 +08:00
parent 121c065d27
commit 0074468c29
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/utils/ElasticSearchConverter.java
View File

@ -1,5 +1,6 @@
package org.jetlinks.community.elastic.search.utils;
import com.google.common.collect.Collections2;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.hswebframework.ezorm.core.param.QueryParam;
import org.jetlinks.community.elastic.search.index.ElasticSearchIndexMetadata;
@ -8,10 +9,7 @@ import org.jetlinks.core.metadata.DataType;
import org.jetlinks.core.metadata.PropertyMetadata;
import org.jetlinks.core.metadata.types.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
public class ElasticSearchConverter {
@ -74,6 +72,13 @@ public class ElasticSearchConverter {
} else if (type instanceof DateTimeType) {
Date date = ((DateTimeType) type).convert(val);
newData.put(property.getId(), date);
} else if (type instanceof ObjectType) {
if (val instanceof Collection) {
val = Collections2.transform(((Collection<?>) val), ((ObjectType) type)::convert);
newData.put(property.getId(), val);
} else {
newData.put(property.getId(), ((ObjectType) type).convert(val));
}
} else if (type instanceof Converter) {
newData.put(property.getId(), ((Converter<?>) type).convert(val));
}