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

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

 package com.elephant.framework.galaxy.aroad.bigdata;
 
-import java.util.List;
-
 /**
  * @program: pingxiang_basedata
  * @description: ${description}
@@ -17,31 +15,45 @@ public class ReadElasticsearch {
         //分词查询桥梁数据返回list集合
        //List<Basebridgealldata> basebridgealldataList = EsUtil_fanshe.queryBridge("广州桥", "basebridgealldata", "2018", 0, 2000000000);
         //词条查询桥梁代码数据返回list集合
-//        List<Basebridgealldata> basebridgealldataList = EsUtil_fanshe.queryBridgeQLDM("G3W371726L0012", "basebridgealldata", "2018", 0, 2000000000);
-//        for (Basebridgealldata basebridgealldata : basebridgealldataList) {
-//            System.out.println(basebridgealldata);
-//        }
+       //List<Basebridgealldata> basebridgealldataList = EsUtil_fanshe.queryBridgeQLDM("G3W371726L0012", "basebridgealldata", "2018", 0, 2000000000);
+        //查询桥梁所有数据
+        //List<Basebridgealldata> basebridgealldataList = EsUtil_fanshe.queryBridgeAll("basebridgealldata", "2018", 0, 2000000000);
+       /* for (Basebridgealldata basebridgealldata : basebridgealldataList) {
+            System.out.println(basebridgealldata);
+        }
+*/
+        //List<Basebridgealldata> basebridgealldataList = EsUtil_fanshe.queryBridge("广州桥", "basebridgealldata", "2018", 0, 2000000000);
         //分词查询路段数据返回list集合
-       //ArrayList<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWay("广州桥", "basehighwayalldata", "2018", 0, 2000000000);
+       //List<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWay("广州桥", "basehighwayalldata", "2018", 0, 2000000000);
         //词条查询路线编号数据返回list集合
-        List<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWayLXBH("S226", "basehighwayalldata", "2018", 0, 2000000000);
-        for (Basehighwayalldata basehighwayalldata : basehighwayalldataList) {
+        //List<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWayLXBH("S226", "basehighwayalldata", "2018", 0, 2000000000);
+       //路段查询所有数据返回
+        //List<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWayAll("basehighwayalldata", "2018", 0, 2000000000);
+        /*for (Basehighwayalldata basehighwayalldata : basehighwayalldataList) {
             System.out.println(basehighwayalldata);
-        }
+        }*/
+
         //分词查询隧道数据返回list集合
         //List<Basetunnelalldata> basetunnelalldataList = EsUtil_fanshe.queryTunnel("港沟", "basetunnelalldata", "2018", 0, 2000000000);
         //termquery()隧道代码词条查询返回list集合
         //List<Basetunnelalldata> basetunnelalldataList = EsUtil_fanshe.queryTunnelSDDM("S89370112U0010", "basetunnelalldata", "2018", 0, 2000000000);
-       /* for (Basetunnelalldata basetunnelalldata : basetunnelalldataList) {
+       //查询隧道所有数据返回
+        //List<Basetunnelalldata> basetunnelalldataList = EsUtil_fanshe.queryTunnelAll("basetunnelalldata", "2018", 0, 2000000000);
+        /*for (Basetunnelalldata basetunnelalldata : basetunnelalldataList) {
             System.out.println(basetunnelalldata);
         }*/
+
         //分词查询收费站数据返回list集合
-        //ArrayList<BaseRoadToll_String> baseRoadTollStrings = EsUtil_fanshe.queryBaseRoadTollString("广州桥", "baseroadtolldata", "2018", 0, 2000000000);
-       /* for (BaseRoadToll_String baseRoadTollString : baseRoadTollStrings) {
+        //List<BaseRoadToll_String> baseRoadTollStrings = EsUtil_fanshe.queryBaseRoadTollString("广州桥", "baseroadtolldata", "2018", 0, 2000000000);
+       //查询收费站所有数据返回
+        //List<BaseRoadToll_String> baseRoadTollStrings = EsUtil_fanshe.queryBaseRoadTollStringAll("baseroadtolldata", "2018", 0, 2000000000);
+        /* for (BaseRoadToll_String baseRoadTollString : baseRoadTollStrings) {
             System.out.println(baseRoadTollString.toString());
         }*/
         //分词查询服务区数据返回list集合
-        //ArrayList<BaseHighWayService> baseHighWayServices = EsUtil_fanshe.queryBaseHighWayService("京岚线", "basehighwayservice", "2018", 0, 2000000000);
+        //List<BaseHighWayService> baseHighWayServices = EsUtil_fanshe.queryBaseHighWayService("京岚线", "basehighwayservice", "2018", 0, 2000000000);
+        //查询服务区所有数据返回
+        //List<BaseHighWayService> baseHighWayServices = EsUtil_fanshe.queryBaseHighWayServiceAll("basehighwayservice", "2018", 0, 2000000000);
         /*for (BaseHighWayService baseHighWayService : baseHighWayServices) {
             System.out.println(baseHighWayService);
         }*/