Commit 07fb7658 authored by duanruiming's avatar duanruiming

[update] 优化红灯倒计时

parent a9695b8f
utc.service.url=http://172.17.0.1:32000/utc
utc.dt.service.url=http://172.17.0.1:39002/utc-dt
utc.hisense.service.url=http://172.17.0.1:39003/utc-hisense
control.url=http://172.17.0.1:32001/web
utc.service.url=http://173.17.0.1:32000/utc
utc.dt.service.url=http://173.17.0.1:39002/utc-dt
utc.hisense.service.url=http://173.17.0.1:39003/utc-hisense
control.url=http://173.17.0.1:32001/web
......@@ -99,6 +99,7 @@ public class HisensePhaseCountDownTask {
if (!CollectionUtils.isEmpty(phaseCountDownList)) {
for (PhaseCountDownDTO phaseCountDownDTO : phaseCountDownList) {
Integer changePhaseTime = phaseCountDownDTO.getChangePhaseTime();
Integer phaseTime = phaseCountDownDTO.getPhaseTime();
Integer cycleLen = lightsStatusVO.getCycleLen();
Integer cycleCountDown = lightsStatusVO.getCycleCountDown();
String currenPhaseId = lightsStatusVO.getPhaseId();
......@@ -120,9 +121,9 @@ public class HisensePhaseCountDownTask {
continue;
}
Integer type = lightsPOS.get(0).getType();
redCountDown = changePhaseTime - runtime;
redCountDown = changePhaseTime - runtime - phaseTime;
if (redCountDown < 0) {
redCountDown = cycleLen + redCountDown;
redCountDown = cycleLen - runtime;
}
if (type == 2) { // 圆饼灯
List<Integer> dirList = Arrays.asList(1, 2, 3);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment