商品搜索支持货号精准查询；失去全文检索能力

framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java

@@ -21,10 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.common.lucene.search.function.FieldValueFactorFunction;
 import org.elasticsearch.common.lucene.search.function.FunctionScoreQuery;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.Operator;
-import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.*;
 import org.elasticsearch.index.query.functionscore.FieldValueFactorFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
 import org.elasticsearch.index.query.functionscore.GaussDecayFunctionBuilder;
@@ -93,13 +90,69 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
         if (CharSequenceUtil.isNotEmpty(searchDTO.getKeyword())) {
             cache.incrementScore(CachePrefix.HOT_WORD.getPrefix(), searchDTO.getKeyword());
         }
-        NativeSearchQueryBuilder searchQueryBuilder = createSearchQueryBuilder(searchDTO, pageVo);
+
+        NativeSearchQueryBuilder searchQueryBuilder = simpleSearch(searchDTO, pageVo);
         NativeSearchQuery searchQuery = searchQueryBuilder.build();
         log.info("searchGoods DSL:{}", searchQuery.getQuery());
         SearchHits<EsGoodsIndex> search = restTemplate.search(searchQuery, EsGoodsIndex.class);
         return SearchHitSupport.searchPageFor(search, searchQuery.getPageable());
     }
 
+    private NativeSearchQueryBuilder simpleSearch(EsGoodsSearchDTO searchDTO, PageVO pageVo){
+        NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
+        if (pageVo != null) {
+            int pageNumber = pageVo.getPageNumber() - 1;
+            if (pageNumber < 0) {
+                pageNumber = 0;
+            }
+            Pageable pageable = PageRequest.of(pageNumber, pageVo.getPageSize());
+            //分页
+            nativeSearchQueryBuilder.withPageable(pageable);
+        }
+        //查询参数非空判定
+        if (searchDTO != null) {
+            //过滤条件
+            BoolQueryBuilder filterBuilder = QueryBuilders.boolQuery();
+
+            //对查询条件进行处理
+            this.commonSearch(filterBuilder, searchDTO);
+
+            //未上架的商品不显示
+            filterBuilder.must(QueryBuilders.matchQuery("marketEnable", GoodsStatusEnum.UPPER.name()));
+            //待审核和审核不通过的商品不显示
+            filterBuilder.must(QueryBuilders.matchQuery("authFlag", GoodsAuthEnum.PASS.name()));
+
+
+            //关键字检索
+            if (CharSequenceUtil.isEmpty(searchDTO.getKeyword())) {
+                List<FunctionScoreQueryBuilder.FilterFunctionBuilder> filterFunctionBuilders = new ArrayList<>();
+                GaussDecayFunctionBuilder skuNoScore = ScoreFunctionBuilders.gaussDecayFunction("skuSource", 100, 10).setWeight(10);
+                FunctionScoreQueryBuilder.FilterFunctionBuilder skuNoBuilder = new FunctionScoreQueryBuilder.FilterFunctionBuilder(QueryBuilders.matchAllQuery(), skuNoScore);
+                filterFunctionBuilders.add(skuNoBuilder);
+                FunctionScoreQueryBuilder.FilterFunctionBuilder[] builders = new FunctionScoreQueryBuilder.FilterFunctionBuilder[filterFunctionBuilders.size()];
+                filterFunctionBuilders.toArray(builders);
+                FunctionScoreQueryBuilder functionScoreQueryBuilder = QueryBuilders.functionScoreQuery(builders)
+                        .scoreMode(FunctionScoreQuery.ScoreMode.SUM)
+                        .setMinScore(2);
+                //聚合搜索则将结果放入过滤条件
+                filterBuilder.must(functionScoreQueryBuilder);
+            } else {
+                this.keywordSearchV2(filterBuilder, searchDTO.getKeyword());
+            }
+
+            //如果是聚合查询
+            nativeSearchQueryBuilder.withQuery(filterBuilder);
+
+
+            if (pageVo != null && CharSequenceUtil.isNotEmpty(pageVo.getOrder()) && CharSequenceUtil.isNotEmpty(pageVo.getSort())) {
+                nativeSearchQueryBuilder.withSort(SortBuilders.fieldSort(pageVo.getSort()).order(SortOrder.valueOf(pageVo.getOrder().toUpperCase())));
+            } else {
+                nativeSearchQueryBuilder.withSort(SortBuilders.fieldSort("releaseTime").order(SortOrder.DESC));
+            }
+        }
+        return nativeSearchQueryBuilder;
+    }
+
     @Override
     public List<String> getHotWords(Integer count) {
         if (count == null) {
@@ -417,7 +470,7 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
                 //聚合搜索则将结果放入过滤条件
                 filterBuilder.must(functionScoreQueryBuilder);
             } else {
-                this.keywordSearch(filterBuilder, searchDTO.getKeyword());
+                this.keywordSearchV2(filterBuilder, searchDTO.getKeyword());
             }
 
             //如果是聚合查询
@@ -535,6 +588,16 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
      * @param filterBuilder 过滤构造器
      * @param keyword       关键字
      */
+    private void keywordSearchV2(BoolQueryBuilder filterBuilder, String keyword) {
+        filterBuilder.must(QueryBuilders.fuzzyQuery("goodsName", "*" + keyword + "*"));
+    }
+
+    /**
+     * 关键字查询处理
+     *
+     * @param filterBuilder 过滤构造器
+     * @param keyword       关键字
+     */
     private void keywordSearch(BoolQueryBuilder filterBuilder, String keyword) {
         List<FunctionScoreQueryBuilder.FilterFunctionBuilder> filterFunctionBuilders = new ArrayList<>();
         if (keyword.contains(" ")) {