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
bf5f9810
Commit
bf5f9810
authored
May 20, 2024
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
轨迹调整提交(西藏)
parent
d3ec1969
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/InterfaceAPI.java
+8
-6
No files found.
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/InterfaceAPI.java
View file @
bf5f9810
...
@@ -101,7 +101,8 @@ public class InterfaceAPI {
...
@@ -101,7 +101,8 @@ public class InterfaceAPI {
List
<
EsHbDpQueryJbxx
>
listMhxxTarget1Distinct
=
mhxx
.
stream
()
List
<
EsHbDpQueryJbxx
>
listMhxxTarget1Distinct
=
mhxx
.
stream
()
.
collect
(
Collectors
.
collectingAndThen
(
Collectors
.
toCollection
(
.
collect
(
Collectors
.
collectingAndThen
(
Collectors
.
toCollection
(
()
->
new
TreeSet
<>(
Comparator
.
comparing
(
EsHbDpQueryJbxx:
:
getStti
))),
ArrayList:
:
new
));
()
->
new
TreeSet
<>(
Comparator
.
comparing
(
EsHbDpQueryJbxx:
:
getStti
))),
ArrayList:
:
new
));
for
(
EsHbDpQueryJbxx
esHbDpQueryJbxxResult
:
listMhxxTarget1Distinct
)
{
List
<
EsHbDpQueryJbxx
>
listMhxxTarget1Sort
=
listMhxxTarget1Distinct
.
stream
().
sorted
(
Comparator
.
comparing
(
EsHbDpQueryJbxx:
:
getStti
).
reversed
()).
collect
(
Collectors
.
toList
());
for
(
EsHbDpQueryJbxx
esHbDpQueryJbxxResult
:
listMhxxTarget1Sort
)
{
// 出发地
// 出发地
SkTrail
skTrailCf
=
new
SkTrail
();
SkTrail
skTrailCf
=
new
SkTrail
();
// 经纬度处理
// 经纬度处理
...
@@ -192,7 +193,8 @@ public class InterfaceAPI {
...
@@ -192,7 +193,8 @@ public class InterfaceAPI {
List
<
EsTrainQuery
>
listTrainxxTarget1Distinct
=
listTrain
.
stream
()
List
<
EsTrainQuery
>
listTrainxxTarget1Distinct
=
listTrain
.
stream
()
.
collect
(
Collectors
.
collectingAndThen
(
Collectors
.
toCollection
(
.
collect
(
Collectors
.
collectingAndThen
(
Collectors
.
toCollection
(
()
->
new
TreeSet
<>(
Comparator
.
comparing
(
EsTrainQuery:
:
getFitm
))),
ArrayList:
:
new
));
()
->
new
TreeSet
<>(
Comparator
.
comparing
(
EsTrainQuery:
:
getFitm
))),
ArrayList:
:
new
));
for
(
EsTrainQuery
esTrainQueryResult
:
listTrainxxTarget1Distinct
)
{
List
<
EsTrainQuery
>
listTrainxxTarget1Sort
=
listTrainxxTarget1Distinct
.
stream
().
sorted
(
Comparator
.
comparing
(
EsTrainQuery:
:
getFitm
).
reversed
()).
collect
(
Collectors
.
toList
());
for
(
EsTrainQuery
esTrainQueryResult
:
listTrainxxTarget1Sort
)
{
// 出发地
// 出发地
SkTrail
skTrailCf
=
new
SkTrail
();
SkTrail
skTrailCf
=
new
SkTrail
();
// 经纬度处理
// 经纬度处理
...
@@ -203,8 +205,8 @@ public class InterfaceAPI {
...
@@ -203,8 +205,8 @@ public class InterfaceAPI {
skTrailCf
.
setY
(
xycf
[
0
]);
skTrailCf
.
setY
(
xycf
[
0
]);
}
}
}
}
skTrailCf
.
setDate
(
esTrainQueryResult
.
getFitm
(
));
skTrailCf
.
setDate
(
DateUtil
.
getTimeTz
(
esTrainQueryResult
.
getFitm
()
));
skTrailCf
.
setTime
(
DateUtil
.
getTimeStamp
(
esTrainQueryResult
.
getFitm
(
)));
skTrailCf
.
setTime
(
DateUtil
.
getTimeStamp
(
DateUtil
.
getTimeTz
(
esTrainQueryResult
.
getFitm
()
)));
skTrailCf
.
setAddress
(
esTrainQueryResult
.
getFrsa
());
skTrailCf
.
setAddress
(
esTrainQueryResult
.
getFrsa
());
skTrailCf
.
setObjecttype
(
"hcgj"
);
skTrailCf
.
setObjecttype
(
"hcgj"
);
skTrailCf
.
setObjectname
(
"火车轨迹"
);
skTrailCf
.
setObjectname
(
"火车轨迹"
);
...
@@ -213,8 +215,8 @@ public class InterfaceAPI {
...
@@ -213,8 +215,8 @@ public class InterfaceAPI {
points
.
add
(
skTrailCf
);
points
.
add
(
skTrailCf
);
// 目的地
// 目的地
SkTrail
skTrailDd
=
new
SkTrail
();
SkTrail
skTrailDd
=
new
SkTrail
();
skTrailDd
.
setDate
(
esTrainQueryResult
.
getLatm
(
));
skTrailDd
.
setDate
(
DateUtil
.
getTimeTz
(
esTrainQueryResult
.
getLatm
()
));
skTrailDd
.
setTime
(
DateUtil
.
getTimeStamp
(
esTrainQueryResult
.
getLatm
(
)));
skTrailDd
.
setTime
(
DateUtil
.
getTimeStamp
(
DateUtil
.
getTimeTz
(
esTrainQueryResult
.
getLatm
()
)));
if
(
StringUtils
.
isNotBlank
(
esTrainQueryResult
.
getDloc
()))
{
if
(
StringUtils
.
isNotBlank
(
esTrainQueryResult
.
getDloc
()))
{
String
xydd
[]
=
esTrainQueryResult
.
getDloc
().
split
(
","
);
String
xydd
[]
=
esTrainQueryResult
.
getDloc
().
split
(
","
);
if
(
xydd
.
length
>
0
)
{
if
(
xydd
.
length
>
0
)
{
...
...
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