|
@@ -36,9 +36,11 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
|
|
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
|
|
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
-import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
-import java.util.*;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.Iterator;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
@@ -121,7 +123,7 @@ public class EsProductServiceImpl implements EsProductService {
|
|
nativeSearchQueryBuilder.withFilter(boolQueryBuilder);
|
|
nativeSearchQueryBuilder.withFilter(boolQueryBuilder);
|
|
}
|
|
}
|
|
//搜索
|
|
//搜索
|
|
- if (StringUtils.isEmpty(keyword)) {
|
|
|
|
|
|
+ if (StrUtil.isEmpty(keyword)) {
|
|
nativeSearchQueryBuilder.withQuery(QueryBuilders.matchAllQuery());
|
|
nativeSearchQueryBuilder.withQuery(QueryBuilders.matchAllQuery());
|
|
} else {
|
|
} else {
|
|
List<FunctionScoreQueryBuilder.FilterFunctionBuilder> filterFunctionBuilders = new ArrayList<>();
|
|
List<FunctionScoreQueryBuilder.FilterFunctionBuilder> filterFunctionBuilders = new ArrayList<>();
|