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
3823596a
Commit
3823596a
authored
Jan 31, 2024
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 优化圆饼灯处理,不需要此代码
parent
2d0df2e2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
SignalStatus4StaticSchemeTask.java
...ava/net/wanji/utc/task/SignalStatus4StaticSchemeTask.java
+11
-11
No files found.
signal-utc-service/src/main/java/net/wanji/utc/task/SignalStatus4StaticSchemeTask.java
View file @
3823596a
...
...
@@ -478,17 +478,17 @@ public class SignalStatus4StaticSchemeTask {
if
(!
CollectionUtils
.
isEmpty
(
crossPhaseDirTurnCache
))
{
Map
<
String
,
Object
>
dirLampGroupMap
=
new
HashMap
<>();
setPhaseLampColor
(
crossId
,
currentSchemeNo
,
currentPhaseNo
,
cyclePhaseCountDown
,
crossPhaseDirTurnCache
,
dirLampGroupMap
);
// 海信,箭头灯变圆饼灯
for
(
Map
.
Entry
<
String
,
Object
>
arrowEntry
:
dirLampGroupMap
.
entrySet
())
{
String
dir
=
arrowEntry
.
getKey
();
Map
<
Integer
,
String
>
turnColor
=
(
Map
<
Integer
,
String
>)
arrowEntry
.
getValue
();
if
(!
turnColor
.
isEmpty
()
&&
!
turnColor
.
containsKey
(
1
))
{
// 如果不包含左转, 左转灯色为直行
String
straightColor
=
turnColor
.
get
(
2
);
turnColor
.
put
(
1
,
straightColor
);
dirLampGroupMap
.
put
(
dir
,
turnColor
);
}
}
//
//
海信,箭头灯变圆饼灯
//
for (Map.Entry<String, Object> arrowEntry : dirLampGroupMap.entrySet()) {
//
String dir = arrowEntry.getKey();
//
Map<Integer, String> turnColor = (Map<Integer, String>) arrowEntry.getValue();
//
if (!turnColor.isEmpty() && !turnColor.containsKey(1)) {
//
// 如果不包含左转, 左转灯色为直行
//
String straightColor = turnColor.get(2);
//
turnColor.put(1, straightColor);
//
dirLampGroupMap.put(dir, turnColor);
//
}
//
}
lightsStatusVO
.
setDirLampGroupMap
(
dirLampGroupMap
);
}
}
...
...
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