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
a2a46f5f
Commit
a2a46f5f
authored
Nov 15, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 优化灯态信息
parent
096311f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
HisensePhaseCountDownTask.java
...net/wanji/utc/hisense/task/HisensePhaseCountDownTask.java
+2
-2
LightsStatusVO.java
...us/src/main/java/net/wanji/databus/vo/LightsStatusVO.java
+2
-2
No files found.
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/task/HisensePhaseCountDownTask.java
View file @
a2a46f5f
...
@@ -201,8 +201,8 @@ public class HisensePhaseCountDownTask {
...
@@ -201,8 +201,8 @@ public class HisensePhaseCountDownTask {
private
static
void
setPhaseMap
(
Map
<
String
,
Object
>
phaseMap
,
Integer
dir
,
Map
<
Integer
,
Integer
>
turnCountDown
)
{
private
static
void
setPhaseMap
(
Map
<
String
,
Object
>
phaseMap
,
Integer
dir
,
Map
<
Integer
,
Integer
>
turnCountDown
)
{
String
dirStr
=
String
.
valueOf
(
dir
);
String
dirStr
=
String
.
valueOf
(
dir
);
if
(!
phaseMap
.
isEmpty
()
&&
Objects
.
nonNull
(
phaseMap
.
get
(
dirStr
)))
{
if
(!
phaseMap
.
isEmpty
()
&&
Objects
.
nonNull
(
phaseMap
.
get
(
dirStr
)))
{
Map
<
Integer
,
Integer
>
turnCountDownCa
hc
e
=
(
Map
<
Integer
,
Integer
>)
phaseMap
.
get
(
dirStr
);
Map
<
Integer
,
Integer
>
turnCountDownCa
ch
e
=
(
Map
<
Integer
,
Integer
>)
phaseMap
.
get
(
dirStr
);
turnCountDown
Cahce
.
putAll
(
turnCountDown
);
turnCountDown
.
putAll
(
turnCountDownCache
);
phaseMap
.
put
(
String
.
valueOf
(
dir
),
turnCountDown
);
phaseMap
.
put
(
String
.
valueOf
(
dir
),
turnCountDown
);
}
else
{
}
else
{
phaseMap
.
put
(
String
.
valueOf
(
dir
),
turnCountDown
);
phaseMap
.
put
(
String
.
valueOf
(
dir
),
turnCountDown
);
...
...
wj-databus/src/main/java/net/wanji/databus/vo/LightsStatusVO.java
View file @
a2a46f5f
...
@@ -26,7 +26,7 @@ public class LightsStatusVO extends BaseCrossInfo {
...
@@ -26,7 +26,7 @@ public class LightsStatusVO extends BaseCrossInfo {
private
String
schemeStartTime
;
private
String
schemeStartTime
;
@ApiModelProperty
(
value
=
"相位周期剩余时长"
)
@ApiModelProperty
(
value
=
"相位周期剩余时长"
)
private
Integer
cycleCountDown
;
private
Integer
cycleCountDown
;
@ApiModelProperty
(
value
=
"相位周期剩余时长"
,
notes
=
"目前没有用到,周期剩余时长就是相位剩余时长"
)
@ApiModelProperty
(
value
=
"相位周期剩余时长"
)
private
Integer
cyclePhaseCountDown
;
private
Integer
cyclePhaseCountDown
;
@ApiModelProperty
(
value
=
"相位周期时长"
)
@ApiModelProperty
(
value
=
"相位周期时长"
)
private
Integer
cycleLen
;
private
Integer
cycleLen
;
...
@@ -37,7 +37,7 @@ public class LightsStatusVO extends BaseCrossInfo {
...
@@ -37,7 +37,7 @@ public class LightsStatusVO extends BaseCrossInfo {
private
String
schemeId
;
private
String
schemeId
;
@ApiModelProperty
(
value
=
"灯组状态"
)
@ApiModelProperty
(
value
=
"灯组状态"
)
private
Map
<
String
,
Object
>
dirLampGroupMap
;
private
Map
<
String
,
Object
>
dirLampGroupMap
;
@ApiModelProperty
(
value
=
"方向转向倒计时"
)
@ApiModelProperty
(
value
=
"方向转向
红灯
倒计时"
)
private
Map
<
String
,
Object
>
phaseMap
;
private
Map
<
String
,
Object
>
phaseMap
;
@ApiModelProperty
(
value
=
"数据上报时间戳"
)
@ApiModelProperty
(
value
=
"数据上报时间戳"
)
private
String
timeStamp
;
private
String
timeStamp
;
...
...
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