Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
signal
traffic-signal-platform
Commits
12ee6d2e
Commit
12ee6d2e
authored
Feb 10, 2025
by
zhoushiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修改
parent
e13aa51d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
GreenwaveHistProviderImpl.java
...net/wanji/opt/service/impl/GreenwaveHistProviderImpl.java
+2
-2
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/GreenwaveHistProviderImpl.java
View file @
12ee6d2e
...
@@ -547,7 +547,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
...
@@ -547,7 +547,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
List
<
CrossLaneDataHistPoExtend
>
list
=
greenwaveHistoryMapper
.
findCrossObjectIndex
(
params
);
List
<
CrossLaneDataHistPoExtend
>
list
=
greenwaveHistoryMapper
.
findCrossObjectIndex
(
params
);
list
=
list
.
stream
().
sorted
(
Comparator
.
comparing
(
o
->
o
.
getStartTime
())).
collect
(
Collectors
.
toList
());
list
=
list
.
stream
().
sorted
(
Comparator
.
comparing
(
o
->
o
.
getStartTime
())).
collect
(
Collectors
.
toList
());
//
按时间分组分组
//
路口方向分钟
Map
<
String
,
List
<
CrossLaneDataHistPoExtend
>>
groupByDir
=
list
.
stream
().
collect
(
Collectors
.
groupingBy
(
o
->
o
.
getCrossId
()
+
"_"
+
o
.
getDirType
(),
TreeMap:
:
new
,
Collectors
.
toList
()));
Map
<
String
,
List
<
CrossLaneDataHistPoExtend
>>
groupByDir
=
list
.
stream
().
collect
(
Collectors
.
groupingBy
(
o
->
o
.
getCrossId
()
+
"_"
+
o
.
getDirType
(),
TreeMap:
:
new
,
Collectors
.
toList
()));
Set
<
String
>
hasDataScopeList
=
new
HashSet
<>();
Set
<
String
>
hasDataScopeList
=
new
HashSet
<>();
...
@@ -599,7 +599,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
...
@@ -599,7 +599,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
hasDataScopeList
.
add
(
dirTurnDesc
+
o
.
getTurnTypeName
());
hasDataScopeList
.
add
(
dirTurnDesc
+
o
.
getTurnTypeName
());
}
else
if
(
Objects
.
equals
(
3
,
objectType
))
{
}
else
if
(
Objects
.
equals
(
3
,
objectType
))
{
o
.
setTurnTypeName
(
TurnConvertEnum
.
getDescByKey
(
o
.
getTurnType
())
+
o
.
getLaneNo
()
+
"车道"
);
o
.
setTurnTypeName
(
TurnConvertEnum
.
getDescByKey
(
o
.
getTurnType
())
+
o
.
getLaneNo
()
+
"车道"
);
hasDataScopeList
.
add
(
dirTurnDesc
+
o
.
getTurnTypeName
()
+
o
.
getLaneNo
()
+
"车道"
);
hasDataScopeList
.
add
(
dirTurnDesc
+
o
.
getTurnTypeName
());
}
else
{
}
else
{
hasDataScopeList
.
add
(
dirTurnDesc
);
hasDataScopeList
.
add
(
dirTurnDesc
);
}
}
...
...
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