Skip to content

A
aroad_aqsc
提交 43c2d416 authored 作者: xuyanqi's avatar xuyanqi
浏览文件
操作

搜索结构更改

上级 f429e40a
显示空白字符变更
内嵌 并排
正在显示 包含 68 行增加 和 86 行删除
src/main/java/com/elephant/framework/galaxy/aroad/bigdata/ReadElasticsearch.java
浏览文件 @ 43c2d416
package com.elephant.framework.galaxy.aroad.bigdata;
import java.util.List;
/**
* @program: pingxiang_basedata
* @description: ${description}
......@@ -15,17 +17,17 @@ 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);
// 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) {
List<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWayLXBH("S226", "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集合
......
src/main/java/com/elephant/framework/galaxy/aroad/module/szgl/controller/SzglController.java
浏览文件 @ 43c2d416
......@@ -23,41 +23,10 @@ public class SzglController {
@GetMapping("/bigdata")
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);
// if(bridgeOne){
// responseList.add(new HashMap<String,Object>(){{
// put("label","桥梁");
// put("name","qiaoliang");
// }});
// }
// //查询匹配路段名称
// Boolean highWayOne = EsUtil_fanshe.queryHighWayOne(keyword ,"basichighwaydata", "2018", 0, 2000000000);
// if(highWayOne){
// responseList.add(new HashMap<String,Object>(){{
// put("label","路段");
// put("name","luduan");
// }});
// }
// //查询匹配隧道名称
// Boolean tunnelOne = EsUtil_fanshe.queryTunnelOne(keyword, "basictunneldata", "2018", 0, 2000000000);
// if(tunnelOne){
// responseList.add(new HashMap<String,Object>(){{
// put("label","隧道");
// put("name","suidao");
// }});
// }
// //查询匹配收费站名称
// Boolean baseRoadTollOne = EsUtil_fanshe.queryBaseRoadTollOne(keyword, "baseroadtolldata", "2018", 0, 2000000000);
// if(baseRoadTollOne){
// responseList.add(new HashMap<String,Object>(){{
// put("label","收费站");
// put("name","shoufeizhan");
// }});
// }
long total = 0;
// 桥梁
List<Basebridgealldata> luKeBridges = EsUtil_fanshe.queryBridge(keyword, "basicbridgedata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
for(Basebridgealldata lnKeBridge : luKeBridges){
Map<String,Object> luKeBridges = EsUtil_fanshe.queryBridge(keyword, "basebridgealldata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
for(Basebridgealldata lnKeBridge : (List<Basebridgealldata>)luKeBridges.get("list")){
responseList.add(new HashMap<String,Object>(){{
put("name",lnKeBridge.getQiaoliangmingcheng());
put("iden","qiaoliang");
......@@ -65,40 +34,47 @@ public class SzglController {
put("data", lnKeBridge);
}});
}
total+=(long)luKeBridges.get("total");
// 路线
// 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){
Map<String,Object> lukehighways = EsUtil_fanshe.queryHighWay(keyword, "basehighwayalldata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
for(Basehighwayalldata basehighwayalldata : (List<Basehighwayalldata>)lukehighways.get("list")){
responseList.add(new HashMap<String,Object>(){{
put("name",basehighwayalldata.getLuxianmingcheng());
put("iden","luxian");
put("idenVal", "路线");
put("data", basehighwayalldata);
put("total", lukehighways.get("total"));
}});
}
total+=(long)lukehighways.get("total");
// 隧道
List<Basetunnelalldata> basicTunnels = EsUtil_fanshe.queryTunnel(keyword, "basictunneldata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
for(Basetunnelalldata basicTunnel : basicTunnels){
Map<String,Object> basicTunnels = EsUtil_fanshe.queryTunnel(keyword, "basetunnelalldata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
for(Basetunnelalldata basicTunnel : (List<Basetunnelalldata>)basicTunnels.get("list")){
responseList.add(new HashMap<String,Object>(){{
put("name",basicTunnel.getSuidaomingcheng());
put("iden","suidao");
put("idenVal", "隧道");
put("data", basicTunnel);
put("total", basicTunnels.get("total"));
}});
}
total+=(long)basicTunnels.get("total");
// 收费站
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){
Map<String,Object> baseRoadTollStrings = EsUtil_fanshe.queryBaseRoadTollString(keyword, "baseroadtolldata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
for(BaseRoadToll_String baseRoadToll_String : (List<BaseRoadToll_String>)baseRoadTollStrings.get("list")){
responseList.add(new HashMap<String,Object>(){{
put("name",baseRoadToll_String.getShortName());
put("iden","shoufeizhan");
put("idenVal", "收费站");
put("data", baseRoadToll_String);
put("total", baseRoadTollStrings.get("total"));
}});
}
total+=(long)baseRoadTollStrings.get("total");
// 服务区
List<BaseHighWayService> baseHighWayServices = EsUtil_fanshe.queryBaseHighWayService(keyword, "baseroadtolldata", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
for(BaseHighWayService baseHighWayService : baseHighWayServices){
Map<String,Object> baseHighWayServices = EsUtil_fanshe.queryBaseHighWayService(keyword, "basehighwayservice", "2018", (int)((page.getCurrent()-1)*page.getSize()), (int)page.getSize());
for(BaseHighWayService baseHighWayService : (List<BaseHighWayService>)baseHighWayServices.get("list")){
responseList.add(new HashMap<String,Object>(){{
put("name",baseHighWayService.getFwssmc());
put("iden","fuwuqu");
......@@ -106,42 +82,46 @@ public class SzglController {
put("data", baseHighWayService);
}});
}
return new R<>(responseList);
}
/**
* 查询桥梁
* @Param keyword 搜索条件
*/
@GetMapping("/bridge")
public R getBridge(@RequestParam("keyword") String keyword) throws Exception {
ArrayList<Basebridgealldata> basebridgealldataList = EsUtil_fanshe.queryBridge(keyword, "basicbridgedata", "2018", 0, 2000000000);
return new R<>(basebridgealldataList);
}
/**
* 查询路段
* @Param keyword 搜索条件
*/
@GetMapping("/highWay")
public R getHighWay(@RequestParam("keyword") String keyword) throws Exception {
ArrayList<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWay(keyword, "basichighwaydata", "2018", 0, 2000000000);
return new R<>(basehighwayalldataList);
}
/**
* 查询隧道
* @Param keyword 搜索条件
*/
@GetMapping("/tunnel")
public R getTunnel(@RequestParam("keyword") String keyword) throws Exception {
List<Basetunnelalldata> basetunnelalldataList = EsUtil_fanshe.queryTunnel("广州桥", "basictunneldata", "2018", 0, 2000000000);
return new R<>(basetunnelalldataList);
}
/**
* 查询收费站
* @Param keyword 搜索条件
*/
@GetMapping("/baseRoadToll")
public R getBaseRoadToll(@RequestParam("keyword") String keyword) throws Exception {
ArrayList<BaseRoadToll_String> baseRoadTollStrings = EsUtil_fanshe.queryBaseRoadTollString(keyword, "baseroadtolldata", "2018", 0, 2000000000);
return new R<>(baseRoadTollStrings);
total+=(long)baseHighWayServices.get("total");
Map<String,Object> responseMap = new HashMap<>();
responseMap.put("result",responseList);
responseMap.put("total",total);
return new R<>(responseMap);
}
// /**
// * 查询桥梁
// * @Param keyword 搜索条件
// */
// @GetMapping("/bridge")
// public R getBridge(@RequestParam("keyword") String keyword) throws Exception {
// ArrayList<Basebridgealldata> basebridgealldataList = EsUtil_fanshe.queryBridge(keyword, "basicbridgedata", "2018", 0, 2000000000);
// return new R<>(basebridgealldataList);
// }
// /**
// * 查询路段
// * @Param keyword 搜索条件
// */
// @GetMapping("/highWay")
// public R getHighWay(@RequestParam("keyword") String keyword) throws Exception {
// ArrayList<Basehighwayalldata> basehighwayalldataList = EsUtil_fanshe.queryHighWay(keyword, "basichighwaydata", "2018", 0, 2000000000);
// return new R<>(basehighwayalldataList);
// }
// /**
// * 查询隧道
// * @Param keyword 搜索条件
// */
// @GetMapping("/tunnel")
// public R getTunnel(@RequestParam("keyword") String keyword) throws Exception {
// List<Basetunnelalldata> basetunnelalldataList = EsUtil_fanshe.queryTunnel("广州桥", "basictunneldata", "2018", 0, 2000000000);
// return new R<>(basetunnelalldataList);
// }
// /**
// * 查询收费站
// * @Param keyword 搜索条件
// */
// @GetMapping("/baseRoadToll")
// public R getBaseRoadToll(@RequestParam("keyword") String keyword) throws Exception {
// ArrayList<BaseRoadToll_String> baseRoadTollStrings = EsUtil_fanshe.queryBaseRoadTollString(keyword, "baseroadtolldata", "2018", 0, 2000000000);
// return new R<>(baseRoadTollStrings);
// }
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论