提交 82edd278 authored 作者: 董吉利's avatar 董吉利

elasticsearch中桥梁,路段,收费站,服务区,隧道排除结果为空,排除过滤空指针

上级 9c6e0a74
......@@ -15,6 +15,7 @@ import lombok.AllArgsConstructor;
import org.apache.commons.lang.StringEscapeUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
......@@ -47,6 +48,7 @@ public class SzglController {
case "路线":
Baseindexdata lx = baseindexdataService.selectLatesByTableName("basehighwayalldata");
Map<String, Object> lukehighways = EsUtil_fanshe.queryHighWay(keyword, "basehighwayalldata", (int) ((page.getCurrent() - 1) * page.getSize()), (int) page.getSize());
if(!ObjectUtils.isEmpty(lukehighways.get("list"))){
for (Basehighwayalldata basehighwayalldata : (List<Basehighwayalldata>) lukehighways.get("list")) {
responseList.add(new HashMap<String, Object>() {{
put("name", basehighwayalldata.getLuxianmingcheng());
......@@ -57,11 +59,14 @@ public class SzglController {
put("total", lukehighways.get("total"));
}});
}
}
total += (long) lukehighways.get("total");
break;
case "桥梁":
Baseindexdata ql = baseindexdataService.selectLatesByTableName("basebridgealldata");
Map<String, Object> luKeBridges = EsUtil_fanshe.queryBridge(keyword, "basebridgealldata", (int) ((page.getCurrent() - 1) * page.getSize()), (int) page.getSize());
if(!ObjectUtils.isEmpty(luKeBridges.get("list"))){
for (Basebridgealldata lnKeBridge : (List<Basebridgealldata>) luKeBridges.get("list")) {
responseList.add(new HashMap<String, Object>() {{
put("name", lnKeBridge.getQiaoliangmingcheng());
......@@ -70,11 +75,13 @@ public class SzglController {
put("data", lnKeBridge);
}});
}
}
total += (long) luKeBridges.get("total");
break;
case "隧道":
Baseindexdata sd = baseindexdataService.selectLatesByTableName("basetunnelalldata");
Map<String, Object> basicTunnels = EsUtil_fanshe.queryTunnel(keyword, "basetunnelalldata", (int) ((page.getCurrent() - 1) * page.getSize()), (int) page.getSize());
if(!ObjectUtils.isEmpty(basicTunnels.get("list"))){
for (Basetunnelalldata basicTunnel : (List<Basetunnelalldata>) basicTunnels.get("list")) {
responseList.add(new HashMap<String, Object>() {{
put("name", basicTunnel.getSuidaomingcheng());
......@@ -84,6 +91,7 @@ public class SzglController {
put("total", basicTunnels.get("total"));
}});
}
}
total += (long) basicTunnels.get("total");
break;
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论