From 10f0ad0e3987853bf41e6a084c35cd136265f47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E9=9D=99?= <jing.du@baifendian.com>
Date: Mon, 13 Sep 2021 18:56:28 +0800
Subject: [PATCH] =?UTF-8?q?release-3.1.3(20210913,=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=86=E5=B4=94=E8=80=81=E5=B8=88=E9=82=A3=E4=B8=AA=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=9A=84=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=94=B9=E6=88=90=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bfd/mf/common/service/cache/TopicQueryService.java  | 17 +++++++++++++++--
 cl_search_api/src/main/resources/application.yml        |  8 ++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/cl_search_api/src/main/java/com/bfd/mf/common/service/cache/TopicQueryService.java b/cl_search_api/src/main/java/com/bfd/mf/common/service/cache/TopicQueryService.java
index 2744b35..f85e4c6 100644
--- a/cl_search_api/src/main/java/com/bfd/mf/common/service/cache/TopicQueryService.java
+++ b/cl_search_api/src/main/java/com/bfd/mf/common/service/cache/TopicQueryService.java
@@ -41,9 +41,22 @@ public class TopicQueryService {
                 boolQuery.must(valueLableQuery);
             }
             // 分类标签
+            // 因为是多选，因此需要判断，如果是多个的话，需要先用, 分隔，然后再用模糊匹配进行查询
             if(!("").equals(queryRequest.getCategoryLabel()) && null != queryRequest.getCategoryLabel()){
-                QueryBuilder categoryLableQuery = QueryBuilders.termQuery(ESConstant.CATEGORYLABEL+".keyword",queryRequest.getCategoryLabel());
-                boolQuery.must(categoryLableQuery);
+              //  QueryBuilder categoryLableQuery = QueryBuilders.queryStringQuery(queryRequest.getCategoryLabel()).defaultField(ESConstant.CATEGORYLABEL); //+".keyword"
+                if(queryRequest.getCategoryLabel().contains(",")){ // 有多个标签查询，用should
+                    String labels []= queryRequest.getCategoryLabel().split(",");
+                    BoolQueryBuilder shouleLaelQuery = QueryBuilders.boolQuery();
+                    for (String label:labels) {
+                        QueryBuilder categoryLableQuery = QueryBuilders.matchPhraseQuery(ESConstant.CATEGORYLABEL,label);
+                        shouleLaelQuery.should(categoryLableQuery);
+                        boolQuery.must(shouleLaelQuery);
+                    }
+                }else{
+                    QueryBuilder categoryLableQuery = QueryBuilders.matchPhraseQuery(ESConstant.CATEGORYLABEL,queryRequest.getCategoryLabel());
+                    boolQuery.must(categoryLableQuery);
+                }
+
             }
             // searchArea  地点
             if (("").equals(queryRequest.getSearchArea())) {
diff --git a/cl_search_api/src/main/resources/application.yml b/cl_search_api/src/main/resources/application.yml
index 8dac74d..8da7d61 100644
--- a/cl_search_api/src/main/resources/application.yml
+++ b/cl_search_api/src/main/resources/application.yml
@@ -7,10 +7,10 @@ server:
   http2:
     enabled: true
 
-logging:
-  config: ../etc/logback.xml
-  level:
-    com.bfd.mf.controller: trace
+#logging:
+#  config: ../etc/logback.xml
+#  level:
+#    com.bfd.mf.controller: trace
 
 spring:
   datasource: