Merge remote-tracking branch 'origin/dev' into dev

community-service/src/main/java/com/tanpu/community/manager/ThemeManager.java

@@ -103,8 +103,10 @@ public class ThemeManager {
         Integer from = (pageNo - 1) * pageSize;
         ThemeFullSearchResp resp = new ThemeFullSearchResp();
 
+        String[] keywords = StringUtils.split(keyword, " ");
+
         // 按时间倒叙查询
-        List<ESThemeQo> esIds = esService.queryThemeIdByContentAndTitle(keyword, from, pageSize * 5);
+        List<ESThemeQo> esIds = esService.queryThemeIdByContentAndTitle(keywords, from, pageSize * 5);
         if (esIds.isEmpty()) {
             return resp;
         }
@@ -123,7 +125,7 @@ public class ThemeManager {
         });
         // 截取关键词出现的那一部分段落
         for (ThemeQo theme : resp.themes) {
-            theme.briefContent4FullSearch = BizUtils.getThemeContent(keyword, theme);
+            theme.briefContent4FullSearch = BizUtils.getThemeContent(keywords, theme);
         }
 
         excludeIds.addAll(resp.themes.stream().map(ThemeQo::getThemeId).collect(Collectors.toList()));

community-service/src/main/java/com/tanpu/community/service/base/ESService.java

@@ -42,14 +42,13 @@ public class ESService {
         helper.insert(String.valueOf(qo.themeType), qo.themeId, JSON.toJSONString(qo));
     }
 
-    public List<ESThemeQo> queryThemeIdByContentAndTitle(String keyword, int from, int size) {
+    public List<ESThemeQo> queryThemeIdByContentAndTitle(String[] keywords, int from, int size) {
         SearchSourceBuilder search = new SearchSourceBuilder();
 
         BoolQueryBuilder boolQb = QueryBuilders.boolQuery();
 
         // 如果关键词带空格，则拆分
-        String[] ks = StringUtils.split(keyword, ' ');
-        for (String k : ks) {
+        for (String k : keywords) {
             MatchPhraseQueryBuilder contentQb = QueryBuilders.matchPhraseQuery("textContent", k);
             MatchPhraseQueryBuilder titleQb = QueryBuilders.matchPhraseQuery("title", k);
             boolQb.should(contentQb);

community-service/src/main/java/com/tanpu/community/util/BizUtils.java

@@ -18,9 +18,10 @@ public class BizUtils {
         return list.subList(start, realEnd);
     }
 
-    public static String getThemeContent(String keyword, ThemeQo theme) {
+    public static String getThemeContent(String[] keywords, ThemeQo theme) {
         for (ThemeContentQo paragraph : theme.content) {
             if (paragraph.getType().equals(RelTypeEnum.TEXT.type)) {
+                for (String keyword : keywords) {
                     int idx = paragraph.getValue().indexOf(keyword);
 
                     if (idx == -1) {
@@ -34,6 +35,7 @@ public class BizUtils {
                     }
                 }
             }
+        }
         return "";
     }