Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
map-parent
Commits
d2ab65f4
Commit
d2ab65f4
authored
Jul 11, 2022
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
弱轨迹统计计算提交(湖南)
parent
9b3c5e1d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/InterfaceAPI.java
+4
-4
No files found.
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/InterfaceAPI.java
View file @
d2ab65f4
...
@@ -101,7 +101,7 @@ public class InterfaceAPI {
...
@@ -101,7 +101,7 @@ public class InterfaceAPI {
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
endDate
))
{
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
endDate
))
{
sql
+=
"AND KSSJ < '"
+
timetoGj
(
endDate
)
+
"' "
;
sql
+=
"AND KSSJ < '"
+
timetoGj
(
endDate
)
+
"' "
;
}
}
sql
+=
" limit "
+
begin
+
",
"
+
rows
+
" order by KSSJ desc"
;
sql
+=
" limit "
+
begin
+
",
1000"
+
" order by KSSJ desc"
;
Map
resultMap
=
EsUtils
.
newQueryEs
(
request
,
sql
);
Map
resultMap
=
EsUtils
.
newQueryEs
(
request
,
sql
);
List
<
SkTrail
>
points
=
new
ArrayList
<>();
// 返回数据与前端一致
List
<
SkTrail
>
points
=
new
ArrayList
<>();
// 返回数据与前端一致
...
@@ -307,7 +307,7 @@ public class InterfaceAPI {
...
@@ -307,7 +307,7 @@ public class InterfaceAPI {
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
endDate
))
{
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
endDate
))
{
sql
+=
"AND KSSJ < '"
+
endDate
+
"' "
;
sql
+=
"AND KSSJ < '"
+
endDate
+
"' "
;
}
}
sql
+=
" limit "
+
begin
+
",
"
+
rows
+
" order by KSSJ desc"
;
sql
+=
" limit "
+
begin
+
",
1000"
+
" order by KSSJ desc"
;
Map
resultMap
=
EsUtils
.
newQueryEs
(
request
,
sql
);
Map
resultMap
=
EsUtils
.
newQueryEs
(
request
,
sql
);
List
<
SkTrail
>
points
=
new
ArrayList
<>();
// 返回数据与前端一致
List
<
SkTrail
>
points
=
new
ArrayList
<>();
// 返回数据与前端一致
if
(
null
!=
resultMap
.
get
(
"data"
)){
if
(
null
!=
resultMap
.
get
(
"data"
)){
...
@@ -517,7 +517,7 @@ public class InterfaceAPI {
...
@@ -517,7 +517,7 @@ public class InterfaceAPI {
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
endDate
))
{
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
endDate
))
{
sql
+=
" AND KSSJ < '"
+
endDate
+
"' "
;
sql
+=
" AND KSSJ < '"
+
endDate
+
"' "
;
}
}
sql
+=
" limit "
+
begin
+
",
"
+
rows
+
" order by KSSJ desc"
;
sql
+=
" limit "
+
begin
+
",
1000"
+
" order by KSSJ desc"
;
Map
resultMap
=
EsUtils
.
newQueryEs
(
request
,
sql
);
Map
resultMap
=
EsUtils
.
newQueryEs
(
request
,
sql
);
List
<
SkTrail
>
points
=
new
ArrayList
<>();
// 返回数据与前端一致
List
<
SkTrail
>
points
=
new
ArrayList
<>();
// 返回数据与前端一致
if
(
null
!=
resultMap
.
get
(
"data"
)){
if
(
null
!=
resultMap
.
get
(
"data"
)){
...
@@ -636,7 +636,7 @@ public class InterfaceAPI {
...
@@ -636,7 +636,7 @@ public class InterfaceAPI {
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
endDate
))
{
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNotBlank
(
endDate
))
{
sql
+=
"AND KSSJ < '"
+
endDate
+
"' "
;
sql
+=
"AND KSSJ < '"
+
endDate
+
"' "
;
}
}
sql
+=
" AND JSSJ IS NOT NULL limit "
+
begin
+
",
"
+
rows
+
" "
+
sql
+=
" AND JSSJ IS NOT NULL limit "
+
begin
+
",
1000"
+
" "
+
"order by KSSJ desc"
;
"order by KSSJ desc"
;
Map
resultMap
=
EsUtils
.
newQueryEs
(
request
,
sql
);
Map
resultMap
=
EsUtils
.
newQueryEs
(
request
,
sql
);
List
<
SkTrail
>
points
=
new
ArrayList
<>();
// 返回数据与前端一致
List
<
SkTrail
>
points
=
new
ArrayList
<>();
// 返回数据与前端一致
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment