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

src/main/java/com/elephant/framework/galaxy/aroad/bigdata/EsUtil_fanshe.java

@@ -242,8 +242,7 @@ public class EsUtil_fanshe {
             //multiMatchQuery多个字段匹配某一个值
             //multiMatchQuery(text,fields)其中的fields是字段的名字，可以写好几个，每一个中间用逗号分隔
             searchRequestBuilder.setQuery(QueryBuilders.multiMatchQuery(keyword,
-                    "qiaoliangmingcheng",
-                    "qiaoliangdaima"
+                    "qiaoliangmingcheng"
             ));
         }
         String[] bridgeNames = {
@@ -738,9 +737,7 @@ public class EsUtil_fanshe {
             //multiMatchQuery(text,fields)其中的fields是字段的名字，可以写好几个，每一个中间用逗号分隔
             searchRequestBuilder.setQuery(QueryBuilders.multiMatchQuery(keyword,
                     "luxianbianhao",
-                    "luxianmingcheng",
-                    "qidianmingcheng",
-                    "zhidianmingcheng"
+                    "luxianmingcheng"
             ));
         }
         String[] highwayNames = {"id",
@@ -1369,7 +1366,6 @@ public class EsUtil_fanshe {
             //multiMatchQuery多个字段匹配某一个值
             //multiMatchQuery(text,fields)其中的fields是字段的名字，可以写好几个，每一个中间用逗号分隔
             searchRequestBuilder.setQuery(QueryBuilders.multiMatchQuery(keyword,
-                    "id",
                     "suidaomingcheng"
             ));
         }
@@ -1462,7 +1458,6 @@ public class EsUtil_fanshe {
             //multiMatchQuery多个字段匹配某一个值
             //multiMatchQuery(text,fields)其中的fields是字段的名字，可以写好几个，每一个中间用逗号分隔
             searchRequestBuilder.setQuery(QueryBuilders.multiMatchQuery(keyword,
-                    "id",
                     "name"
             ));
         }