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
769f5f4e
Commit
769f5f4e
authored
Aug 04, 2023
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 子区范围,双向路段返回两条RID
parent
9211740d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
22 deletions
+0
-22
CrossManageServiceImpl.java
...va/net/wanji/web/service/impl/CrossManageServiceImpl.java
+0
-22
No files found.
signal-control-service/src/main/java/net/wanji/web/service/impl/CrossManageServiceImpl.java
View file @
769f5f4e
...
...
@@ -180,14 +180,6 @@ public class CrossManageServiceImpl implements CrossManageService {
.
filter
(
rid
->
validRid
(
rid
,
crossIdList
))
.
collect
(
Collectors
.
toList
());
// 双向路段只保留一条RID
Iterator
<
RidInfoEntity
>
iterator
=
firstFilterRids
.
iterator
();
while
(
iterator
.
hasNext
())
{
RidInfoEntity
next
=
iterator
.
next
();
if
(
hasDuplicate
(
next
,
firstFilterRids
))
{
iterator
.
remove
();
}
}
// 验证路口数量
Set
<
String
>
ridCrossIds
=
new
HashSet
<>();
for
(
RidInfoEntity
firstFilterRid
:
firstFilterRids
)
{
...
...
@@ -207,20 +199,6 @@ public class CrossManageServiceImpl implements CrossManageService {
return
res
;
}
private
boolean
hasDuplicate
(
RidInfoEntity
rid
,
List
<
RidInfoEntity
>
firstFilterRids
)
{
String
startCrossId
=
rid
.
getStartCrossId
();
String
endCrossId
=
rid
.
getEndCrossId
();
for
(
RidInfoEntity
firstFilterRid
:
firstFilterRids
)
{
String
startCrossId2
=
firstFilterRid
.
getStartCrossId
();
String
endCrossId2
=
firstFilterRid
.
getEndCrossId
();
// 如果开始路口和结束路口对应另一个rid的结束路口和开始路口,则剔除
if
(
Objects
.
equals
(
startCrossId
,
endCrossId2
)
&&
Objects
.
equals
(
endCrossId
,
startCrossId2
))
{
return
true
;
}
}
return
false
;
}
private
boolean
validRid
(
RidInfoEntity
rid
,
List
<
String
>
crossIdList
)
{
String
startCrossId
=
rid
.
getStartCrossId
();
String
endCrossId
=
rid
.
getEndCrossId
();
...
...
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