Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
A
aroad_aqsc
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
许言琪
aroad_aqsc
Commits
82edd278
提交
82edd278
authored
7月 05, 2019
作者:
董吉利
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
elasticsearch中桥梁,路段,收费站,服务区,隧道排除结果为空,排除过滤空指针
上级
9c6e0a74
全部展开
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
8 行增加
和
0 行删除
+8
-0
EsUtil_fanshe.java
...lephant/framework/galaxy/aroad/bigdata/EsUtil_fanshe.java
+0
-0
SzglController.java
...k/galaxy/aroad/module/szgl/controller/SzglController.java
+8
-0
没有找到文件。
src/main/java/com/elephant/framework/galaxy/aroad/bigdata/EsUtil_fanshe.java
浏览文件 @
82edd278
差异被折叠。
点击展开。
src/main/java/com/elephant/framework/galaxy/aroad/module/szgl/controller/SzglController.java
浏览文件 @
82edd278
...
@@ -15,6 +15,7 @@ import lombok.AllArgsConstructor;
...
@@ -15,6 +15,7 @@ import lombok.AllArgsConstructor;
import
org.apache.commons.lang.StringEscapeUtils
;
import
org.apache.commons.lang.StringEscapeUtils
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.client.RestTemplate
;
...
@@ -47,6 +48,7 @@ public class SzglController {
...
@@ -47,6 +48,7 @@ public class SzglController {
case
"路线"
:
case
"路线"
:
Baseindexdata
lx
=
baseindexdataService
.
selectLatesByTableName
(
"basehighwayalldata"
);
Baseindexdata
lx
=
baseindexdataService
.
selectLatesByTableName
(
"basehighwayalldata"
);
Map
<
String
,
Object
>
lukehighways
=
EsUtil_fanshe
.
queryHighWay
(
keyword
,
"basehighwayalldata"
,
(
int
)
((
page
.
getCurrent
()
-
1
)
*
page
.
getSize
()),
(
int
)
page
.
getSize
());
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"
))
{
for
(
Basehighwayalldata
basehighwayalldata
:
(
List
<
Basehighwayalldata
>)
lukehighways
.
get
(
"list"
))
{
responseList
.
add
(
new
HashMap
<
String
,
Object
>()
{{
responseList
.
add
(
new
HashMap
<
String
,
Object
>()
{{
put
(
"name"
,
basehighwayalldata
.
getLuxianmingcheng
());
put
(
"name"
,
basehighwayalldata
.
getLuxianmingcheng
());
...
@@ -57,11 +59,14 @@ public class SzglController {
...
@@ -57,11 +59,14 @@ public class SzglController {
put
(
"total"
,
lukehighways
.
get
(
"total"
));
put
(
"total"
,
lukehighways
.
get
(
"total"
));
}});
}});
}
}
}
total
+=
(
long
)
lukehighways
.
get
(
"total"
);
total
+=
(
long
)
lukehighways
.
get
(
"total"
);
break
;
break
;
case
"桥梁"
:
case
"桥梁"
:
Baseindexdata
ql
=
baseindexdataService
.
selectLatesByTableName
(
"basebridgealldata"
);
Baseindexdata
ql
=
baseindexdataService
.
selectLatesByTableName
(
"basebridgealldata"
);
Map
<
String
,
Object
>
luKeBridges
=
EsUtil_fanshe
.
queryBridge
(
keyword
,
"basebridgealldata"
,
(
int
)
((
page
.
getCurrent
()
-
1
)
*
page
.
getSize
()),
(
int
)
page
.
getSize
());
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"
))
{
for
(
Basebridgealldata
lnKeBridge
:
(
List
<
Basebridgealldata
>)
luKeBridges
.
get
(
"list"
))
{
responseList
.
add
(
new
HashMap
<
String
,
Object
>()
{{
responseList
.
add
(
new
HashMap
<
String
,
Object
>()
{{
put
(
"name"
,
lnKeBridge
.
getQiaoliangmingcheng
());
put
(
"name"
,
lnKeBridge
.
getQiaoliangmingcheng
());
...
@@ -70,11 +75,13 @@ public class SzglController {
...
@@ -70,11 +75,13 @@ public class SzglController {
put
(
"data"
,
lnKeBridge
);
put
(
"data"
,
lnKeBridge
);
}});
}});
}
}
}
total
+=
(
long
)
luKeBridges
.
get
(
"total"
);
total
+=
(
long
)
luKeBridges
.
get
(
"total"
);
break
;
break
;
case
"隧道"
:
case
"隧道"
:
Baseindexdata
sd
=
baseindexdataService
.
selectLatesByTableName
(
"basetunnelalldata"
);
Baseindexdata
sd
=
baseindexdataService
.
selectLatesByTableName
(
"basetunnelalldata"
);
Map
<
String
,
Object
>
basicTunnels
=
EsUtil_fanshe
.
queryTunnel
(
keyword
,
"basetunnelalldata"
,
(
int
)
((
page
.
getCurrent
()
-
1
)
*
page
.
getSize
()),
(
int
)
page
.
getSize
());
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"
))
{
for
(
Basetunnelalldata
basicTunnel
:
(
List
<
Basetunnelalldata
>)
basicTunnels
.
get
(
"list"
))
{
responseList
.
add
(
new
HashMap
<
String
,
Object
>()
{{
responseList
.
add
(
new
HashMap
<
String
,
Object
>()
{{
put
(
"name"
,
basicTunnel
.
getSuidaomingcheng
());
put
(
"name"
,
basicTunnel
.
getSuidaomingcheng
());
...
@@ -84,6 +91,7 @@ public class SzglController {
...
@@ -84,6 +91,7 @@ public class SzglController {
put
(
"total"
,
basicTunnels
.
get
(
"total"
));
put
(
"total"
,
basicTunnels
.
get
(
"total"
));
}});
}});
}
}
}
total
+=
(
long
)
basicTunnels
.
get
(
"total"
);
total
+=
(
long
)
basicTunnels
.
get
(
"total"
);
break
;
break
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论