Skip to content

T
traffic-signal-platform
Commit aedba3f0 authored by duanruiming's avatar duanruiming
Browse files
Options

[update] 相位倒计时优化4

parent 6dcd366d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
signal-utc-dt-service/src/main/java/net/wanji/utc/dt/service/impl/DTSignalStatusServiceImpl.java
View file @ aedba3f0
...@@ -221,7 +221,7 @@ public class DTSignalStatusServiceImpl implements SignalStatusService { ...@@ -221,7 +221,7 @@ public class DTSignalStatusServiceImpl implements SignalStatusService {
lightsStatusVO.setCycleLen(schemeInfoPojo.getCycle()); lightsStatusVO.setCycleLen(schemeInfoPojo.getCycle());
lightsStatusVO.setCycleCountDown(phaseStageStatusPojo.getRemainTime()); lightsStatusVO.setCycleCountDown(phaseStageStatusPojo.getRemainTime());
// 当相位剩余时间小于0是，运行的第二个阶段 // 当相位剩余时间小于0是，运行的第二个阶段
int realRemainTime = phaseStageStatusPojo.getRemainTime() - redTime; int realRemainTime = phaseStageStatusPojo.getRemainTime() - (phaseStageTime - redTime);
if (realRemainTime >= 0) { if (realRemainTime >= 0) {
lightsStatusVO.setPhaseId(String.valueOf(currentPhaseStageId)); lightsStatusVO.setPhaseId(String.valueOf(currentPhaseStageId));
lightsStatusVO.setCyclePhaseCountDown(realRemainTime); lightsStatusVO.setCyclePhaseCountDown(realRemainTime);
...@@ -232,8 +232,8 @@ public class DTSignalStatusServiceImpl implements SignalStatusService { ...@@ -232,8 +232,8 @@ public class DTSignalStatusServiceImpl implements SignalStatusService {
} else { } else {
nextPhaseStageInfoPojo = phaseStageInfoPojos.get(0); nextPhaseStageInfoPojo = phaseStageInfoPojos.get(0);
} }
lightsStatusVO.setPhaseId(String.valueOf(nextPhaseStageInfoPojo.getPhaseStageId())); lightsStatusVO.setPhaseId(String.valueOf(currentPhaseStageId));
lightsStatusVO.setCyclePhaseCountDown(phaseStageStatusPojo.getRemainTime() + redTime); lightsStatusVO.setCyclePhaseCountDown(phaseStageStatusPojo.getRemainTime() + (phaseStageTime - redTime));
} }
} }
} }
......
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