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
7fea895d
Commit
7fea895d
authored
Sep 20, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 修改海信倒计时为相位倒计时
parent
24284475
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
1 deletion
+38
-1
SignalStatusServiceImpl.java
...nji/utc/hisense/service/impl/SignalStatusServiceImpl.java
+1
-1
HisensePhaseCountDownTask.java
...net/wanji/utc/hisense/task/HisensePhaseCountDownTask.java
+37
-0
No files found.
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/SignalStatusServiceImpl.java
View file @
7fea895d
...
@@ -67,7 +67,6 @@ public class SignalStatusServiceImpl implements SignalStatusService {
...
@@ -67,7 +67,6 @@ public class SignalStatusServiceImpl implements SignalStatusService {
}
}
SignalDataCache
.
runningStatusStampMap
.
put
(
crossId
,
signalMachineStamp
);
SignalDataCache
.
runningStatusStampMap
.
put
(
crossId
,
signalMachineStamp
);
}
}
log
.
error
(
"推送数据时间差:{}ms, 海信推送数据时间戳:{}, 上一条数据时间戳:{}"
,
signalMachineStamp
-
lastSignalMachineStamp
,
signalMachineStamp
,
lastSignalMachineStamp
);
int
cycleCountDown
=
content
.
getCycleCountDown
();
int
cycleCountDown
=
content
.
getCycleCountDown
();
int
hiControlMode
=
content
.
getControlMode
();
int
hiControlMode
=
content
.
getControlMode
();
int
period
=
content
.
getPeriod
();
int
period
=
content
.
getPeriod
();
...
@@ -102,6 +101,7 @@ public class SignalStatusServiceImpl implements SignalStatusService {
...
@@ -102,6 +101,7 @@ public class SignalStatusServiceImpl implements SignalStatusService {
Integer
wjTurn
=
DataBrainTurnEnum
.
getWjTurn
(
roadFlowDirection
);
Integer
wjTurn
=
DataBrainTurnEnum
.
getWjTurn
(
roadFlowDirection
);
if
(
StringUtils
.
endsWithIgnoreCase
(
lampStatus
,
"23"
))
{
if
(
StringUtils
.
endsWithIgnoreCase
(
lampStatus
,
"23"
))
{
lightsStatusVO
.
setCyclePhaseCountDown
(
countDown
);
lightsStatusVO
.
setCyclePhaseCountDown
(
countDown
);
lightsStatusVO
.
setCycleCountDown
(
countDown
);
hisTurnList
.
add
(
wjTurn
);
hisTurnList
.
add
(
wjTurn
);
}
}
turnMap
.
put
(
String
.
valueOf
(
wjTurn
),
DataBrainLampStatusEnum
.
getWjLampStatus
(
lampStatus
));
turnMap
.
put
(
String
.
valueOf
(
wjTurn
),
DataBrainLampStatusEnum
.
getWjLampStatus
(
lampStatus
));
...
...
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/task/HisensePhaseCountDownTask.java
0 → 100644
View file @
7fea895d
package
net
.
wanji
.
utc
.
hisense
.
task
;
import
net.wanji.common.utils.tool.StringUtils
;
import
net.wanji.databus.vo.LightsStatusVO
;
import
net.wanji.utc.hisense.cache.SignalDataCache
;
import
org.springframework.scheduling.annotation.Scheduled
;
import
org.springframework.stereotype.Component
;
import
java.util.Map
;
import
java.util.Objects
;
/**
* @author duanruiming
* @date 2023/09/20 14:25
*/
@Component
public
class
HisensePhaseCountDownTask
{
@Scheduled
(
fixedRate
=
1000
,
initialDelay
=
1000
)
public
void
phaseTimeCountDown
()
{
Map
<
String
,
LightsStatusVO
>
runningStateInfoCache4DataBrain
=
SignalDataCache
.
runningStateInfoCache4DataBrain
;
Map
<
String
,
Long
>
runningStatusStampMap
=
SignalDataCache
.
runningStatusStampMap
;
if
(!
runningStateInfoCache4DataBrain
.
isEmpty
())
{
for
(
Map
.
Entry
<
String
,
LightsStatusVO
>
entry
:
runningStateInfoCache4DataBrain
.
entrySet
())
{
String
crossId
=
entry
.
getKey
();
LightsStatusVO
lightsStatusVO
=
entry
.
getValue
();
String
schemeStartTime
=
lightsStatusVO
.
getSchemeStartTime
();
Long
lastPhaseTimeStamp
=
runningStatusStampMap
.
get
(
crossId
);
if
(
Objects
.
nonNull
(
lastPhaseTimeStamp
)
&&
StringUtils
.
equalsIgnoreCase
(
schemeStartTime
,
String
.
valueOf
(
lastPhaseTimeStamp
)))
{
lightsStatusVO
.
setCycleCountDown
(
lightsStatusVO
.
getCycleCountDown
()
-
1
);
runningStateInfoCache4DataBrain
.
put
(
crossId
,
lightsStatusVO
);
}
}
}
}
}
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