搜索

src/main/java/com/elephant/framework/galaxy/aroad/ARoadApplication.java

@@ -15,6 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class ARoadApplication {
 
     public static void main(String[] args) {
+        System.setProperty("es.set.netty.runtime.available.processors","false");
         SpringApplication.run(ARoadApplication.class, args);
     }
 

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}
@@ -13,17 +15,17 @@ public class ReadElasticsearch {
 
     public static void createIndexAnd2Hbase() throws Exception {
         //分词查询桥梁数据返回list集合
-       //ArrayList<Basebridgealldata> basebridgealldataList = EsUtil_fanshe.queryBridge("广州桥", "basebridgealldata", "2018", 0, 2000000000);
-        /*for (Basebridgealldata basebridgealldata : basebridgealldataList) {
-            System.out.println(basebridgealldata);
-        }*/
+//       List<Basebridgealldata> basebridgealldataList = EsUtil_fanshe.queryBridge("广州桥", "basebridgealldata", "2018", 0, 2000000000);
+//        for (Basebridgealldata basebridgealldata : basebridgealldataList) {
+//            System.out.println(basebridgealldata);
+//        }
         //分词查询路段数据返回list集合
        //ArrayList<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWay("广州桥", "basehighwayalldata", "2018", 0, 2000000000);
         //词条查询路线编号数据返回list集合
         //ArrayList<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWayLXBH("S226", "basehighwayalldata", "2018", 0, 2000000000);
-       /* for (Basehighwayalldata basehighwayalldata : basehighwayalldataList) {
-            System.out.println(basehighwayalldata);
-        }*/
+//        for (Basehighwayalldata basehighwayalldata : basehighwayalldataList) {
+//            System.out.println(basehighwayalldata);
+//        }
         //分词查询隧道数据返回list集合
         //List<Basetunnelalldata> basetunnelalldataList = EsUtil_fanshe.queryTunnel("港沟", "basetunnelalldata", "2018", 0, 2000000000);
         /*for (Basetunnelalldata basetunnelalldata : basetunnelalldataList) {

src/main/java/com/elephant/framework/galaxy/aroad/module/szgl/controller/SzglController.java

 package com.elephant.framework.galaxy.aroad.module.szgl.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.bigdata.*;
 import com.elephant.framework.galaxy.aroad.module.codegen.response.R;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,7 +21,7 @@ public class SzglController {
      * @Param keyword 搜索条件
      */
     @GetMapping("/bigdata")
-    public R getBigData(@RequestParam("keyword") String keyword) throws Exception {
+    public R getBigData(String keyword, Page page) throws Exception {
         List<Map<String,Object>> responseList = new ArrayList<>();
 //        //查询匹配桥梁名称
 //        Boolean bridgeOne = EsUtil_fanshe.queryBridgeOne(keyword, "basicbridgedata", "2018", 0, 2000000000);
@@ -55,41 +56,56 @@ public class SzglController {
 //            }});
 //        }
         // 桥梁
-        ArrayList<LuKeBridge> luKeBridges = EsUtil_fanshe.queryBridge(keyword, "basicbridgedata", "2018", 0, 2000000000);
-        for(LuKeBridge lnKeBridge : luKeBridges){
+        List<Basebridgealldata> luKeBridges = EsUtil_fanshe.queryBridge(keyword, "basicbridgedata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
+        for(Basebridgealldata lnKeBridge : luKeBridges){
             responseList.add(new HashMap<String,Object>(){{
                 put("name",lnKeBridge.getQiaoliangmingcheng());
                 put("iden","qiaoliang");
+                put("idenVal", "桥梁");
                 put("data", lnKeBridge);
             }});
         }
         // 路线
-        ArrayList<Basehighwayalldata> lukehighways = EsUtil_fanshe.queryHighWay(keyword, "basichighwaydata", "2018", 0, 2000000000);
+//        ArrayList<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWayLXBH(keyword, "basehighwayalldata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
+        List<Basehighwayalldata> lukehighways = EsUtil_fanshe.queryHighWay(keyword, "basichighwaydata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
         for(Basehighwayalldata basehighwayalldata : lukehighways){
             responseList.add(new HashMap<String,Object>(){{
                 put("name",basehighwayalldata.getLuxianmingcheng());
                 put("iden","luxian");
+                put("idenVal", "路线");
                 put("data", basehighwayalldata);
             }});
         }
         // 隧道
-        ArrayList<BasicTunnel> basicTunnels = EsUtil_fanshe.queryTunnel("广州桥", "basictunneldata", "2018", 0, 2000000000);
-        for(BasicTunnel basicTunnel : basicTunnels){
+        List<Basetunnelalldata> basicTunnels = EsUtil_fanshe.queryTunnel(keyword, "basictunneldata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
+        for(Basetunnelalldata basicTunnel : basicTunnels){
             responseList.add(new HashMap<String,Object>(){{
                 put("name",basicTunnel.getSuidaomingcheng());
                 put("iden","suidao");
+                put("idenVal", "隧道");
                 put("data", basicTunnel);
             }});
         }
         // 收费站
-        ArrayList<BaseRoadToll_String> baseRoadTollStrings = EsUtil_fanshe.queryBaseRoadTollString(keyword, "baseroadtolldata", "2018", 0, 2000000000);
+        List<BaseRoadToll_String> baseRoadTollStrings = EsUtil_fanshe.queryBaseRoadTollString(keyword, "baseroadtolldata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
         for(BaseRoadToll_String baseRoadToll_String : baseRoadTollStrings){
             responseList.add(new HashMap<String,Object>(){{
                 put("name",baseRoadToll_String.getShortName());
                 put("iden","shoufeizhan");
+                put("idenVal", "收费站");
                 put("data", baseRoadToll_String);
             }});
         }
+        // 服务区
+        List<BaseHighWayService> baseHighWayServices = EsUtil_fanshe.queryBaseHighWayService(keyword, "baseroadtolldata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
+        for(BaseHighWayService baseHighWayService : baseHighWayServices){
+            responseList.add(new HashMap<String,Object>(){{
+                put("name",baseHighWayService.getFwssmc());
+                put("iden","fuwuqu");
+                put("idenVal", "服务区");
+                put("data", baseHighWayService);
+            }});
+        }
         return new R<>(responseList);
     }
     /**