2018/5/10 微博网媒组合关键词录入消息规则修改

src/main/java/com/zhiwei/messageflow/es/dao/impl/ESDaoImpl.java

@@ -66,11 +66,11 @@ public class ESDaoImpl implements ESDao {
 				boolQueryBuilder1.should(mixboolQueryBuilder);
 			} else if (word.indexOf(" ") != -1){
 				BoolQueryBuilder mixboolQueryBuilder = QueryBuilders.boolQuery();
-				String words[] = word.split(" ");
-				for (int a = 0; a < words.length; a++) {
-					String allWords = words[a];
-					ESQueryUtil.matchPhraseQueryFields(mixboolQueryBuilder, "must", allWords, "text", "roottext");
-				}
+				String[] words = word.split(" ");
+				mixboolQueryBuilder
+						.should(ESQueryUtil.matchPhraseQueryWords(QueryBuilders.boolQuery(), "must", "text", words));
+				mixboolQueryBuilder.should(
+						ESQueryUtil.matchPhraseQueryWords(QueryBuilders.boolQuery(), "must", "roottext", words));
 				boolQueryBuilder1.should(mixboolQueryBuilder);
 			}else {
 				ESQueryUtil.matchPhraseQueryFields(boolQueryBuilder1, "should", word, "text", "roottext");
@@ -342,12 +342,23 @@ public class ESDaoImpl implements ESDao {
 				boolQueryBuilder1.should(mixboolQueryBuilder);
 			} else if (keyword.indexOf(" ") != -1) {
 				BoolQueryBuilder mixboolQueryBuilder = QueryBuilders.boolQuery();
+				
 				String words[] = keyword.split(" ");
-				for (int i = 0; i < words.length; i++) {
-					String word = words[i];
-					ESQueryUtil.matchPhraseQueryFields(mixboolQueryBuilder, "must", word, "title", "content");
-//					System.err.println("keyword:"+keyword);
-				}
+				// ESQueryUtil.matchPhraseQueryWords(boolQueryBuilder1, "should", "title",
+				// words);
+				// ESQueryUtil.matchPhraseQueryWords(boolQueryBuilder1, "should", "content",
+				// words);
+				mixboolQueryBuilder.should(ESQueryUtil.matchPhraseQueryWords(QueryBuilders.boolQuery(),
+						ESQueryUtil.ES_QUERY_AND, "title", words));
+				mixboolQueryBuilder.should(ESQueryUtil.matchPhraseQueryWords(QueryBuilders.boolQuery(),
+						ESQueryUtil.ES_QUERY_AND, "content", words));
+				
+//				String words[] = keyword.split(" ");
+//				for (int i = 0; i < words.length; i++) {
+//					String word = words[i];
+//					ESQueryUtil.matchPhraseQueryFields(mixboolQueryBuilder, "must", word, "title", "content");
+////					System.err.println("keyword:"+keyword);
+//				}
 				boolQueryBuilder1.should(mixboolQueryBuilder);
 			} else {
 				ESQueryUtil.matchPhraseQueryFields(boolQueryBuilder1, "should", keyword, "title", "content");