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
07fb7658
Commit
07fb7658
authored
Nov 09, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 优化红灯倒计时
parent
a9695b8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
application-docker.properties
...-service/src/main/resources/application-docker.properties
+4
-4
HisensePhaseCountDownTask.java
...net/wanji/utc/hisense/task/HisensePhaseCountDownTask.java
+3
-2
No files found.
signal-feign-service/src/main/resources/application-docker.properties
View file @
07fb7658
utc.service.url
=
http://17
2
.17.0.1:32000/utc
utc.service.url
=
http://17
3
.17.0.1:32000/utc
utc.dt.service.url
=
http://17
2
.17.0.1:39002/utc-dt
utc.dt.service.url
=
http://17
3
.17.0.1:39002/utc-dt
utc.hisense.service.url
=
http://17
2
.17.0.1:39003/utc-hisense
utc.hisense.service.url
=
http://17
3
.17.0.1:39003/utc-hisense
control.url
=
http://17
2
.17.0.1:32001/web
control.url
=
http://17
3
.17.0.1:32001/web
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/task/HisensePhaseCountDownTask.java
View file @
07fb7658
...
@@ -99,6 +99,7 @@ public class HisensePhaseCountDownTask {
...
@@ -99,6 +99,7 @@ public class HisensePhaseCountDownTask {
if
(!
CollectionUtils
.
isEmpty
(
phaseCountDownList
))
{
if
(!
CollectionUtils
.
isEmpty
(
phaseCountDownList
))
{
for
(
PhaseCountDownDTO
phaseCountDownDTO
:
phaseCountDownList
)
{
for
(
PhaseCountDownDTO
phaseCountDownDTO
:
phaseCountDownList
)
{
Integer
changePhaseTime
=
phaseCountDownDTO
.
getChangePhaseTime
();
Integer
changePhaseTime
=
phaseCountDownDTO
.
getChangePhaseTime
();
Integer
phaseTime
=
phaseCountDownDTO
.
getPhaseTime
();
Integer
cycleLen
=
lightsStatusVO
.
getCycleLen
();
Integer
cycleLen
=
lightsStatusVO
.
getCycleLen
();
Integer
cycleCountDown
=
lightsStatusVO
.
getCycleCountDown
();
Integer
cycleCountDown
=
lightsStatusVO
.
getCycleCountDown
();
String
currenPhaseId
=
lightsStatusVO
.
getPhaseId
();
String
currenPhaseId
=
lightsStatusVO
.
getPhaseId
();
...
@@ -120,9 +121,9 @@ public class HisensePhaseCountDownTask {
...
@@ -120,9 +121,9 @@ public class HisensePhaseCountDownTask {
continue
;
continue
;
}
}
Integer
type
=
lightsPOS
.
get
(
0
).
getType
();
Integer
type
=
lightsPOS
.
get
(
0
).
getType
();
redCountDown
=
changePhaseTime
-
runtime
;
redCountDown
=
changePhaseTime
-
runtime
-
phaseTime
;
if
(
redCountDown
<
0
)
{
if
(
redCountDown
<
0
)
{
redCountDown
=
cycleLen
+
redCountDown
;
redCountDown
=
cycleLen
-
runtime
;
}
}
if
(
type
==
2
)
{
// 圆饼灯
if
(
type
==
2
)
{
// 圆饼灯
List
<
Integer
>
dirList
=
Arrays
.
asList
(
1
,
2
,
3
);
List
<
Integer
>
dirList
=
Arrays
.
asList
(
1
,
2
,
3
);
...
...
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