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
6f26352a
Commit
6f26352a
authored
Mar 01, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 实时监控->优化过的路口不再优化
parent
23d6ea4b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
CrossOptimizeServiceImpl.java
.../net/wanji/opt/service/impl/CrossOptimizeServiceImpl.java
+8
-2
CrossSchemeOptLogMapper.xml
...ice/src/main/resources/mapper/CrossSchemeOptLogMapper.xml
+0
-0
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/CrossOptimizeServiceImpl.java
View file @
6f26352a
...
...
@@ -172,6 +172,10 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService {
Integer
inDir
=
ridInfoEntity
.
getInDir
();
if
(!
congestCrossMap
.
containsKey
(
ridInfoEntity
.
getEndCrossId
())
&&
Objects
.
equals
(
inDir
,
dir
))
{
String
endCrossId
=
ridInfoEntity
.
getEndCrossId
();
// 判断当前路口是否已优化
if
(
CROSS_OPT
.
contains
(
endCrossId
))
{
continue
;
}
List
<
CrossTurnDataRealtimeDTO
>
endcrossTurnDataRealtimeDTOS
=
turnDataRealtimeMap
.
get
(
endCrossId
);
if
(
CollectionUtils
.
isEmpty
(
endcrossTurnDataRealtimeDTOS
))
{
log
.
error
(
"溢出路口:{},优化其下游路口:{}时,路口转向数据为空"
,
crossId
,
ridInfoEntity
.
getEndCrossId
());
...
...
@@ -233,10 +237,12 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService {
// 拥堵路口对上游路口进行优化
for
(
RidInfoEntity
ridInfoEntity
:
ridInfoEntities
)
{
String
startCrossId
=
ridInfoEntity
.
getStartCrossId
();
// 上游路口时拥堵路口时,不进行优化
if
(
congestCrossMap
.
containsKey
(
startCrossId
))
{
// 上游路口时拥堵路口时,不进行优化或者判断当前路口是否已优化
if
(
congestCrossMap
.
containsKey
(
startCrossId
)
||
CROSS_OPT
.
contains
(
startCrossId
))
{
continue
;
}
Integer
inDir
=
ridInfoEntity
.
getInDir
();
// 优化当前开始路口的此方向直行,和逆时针方向左转
if
(
Objects
.
equals
(
inDir
,
intCongestionDir
))
{
...
...
signal-optimize-service/src/main/resources/mapper/CrossSchem
a
OptLogMapper.xml
→
signal-optimize-service/src/main/resources/mapper/CrossSchem
e
OptLogMapper.xml
View file @
6f26352a
File moved
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