Commit a2a46f5f authored by duanruiming's avatar duanruiming

[update] 优化灯态信息

parent 096311f7
...@@ -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> turnCountDownCahce = (Map<Integer, Integer>) phaseMap.get(dirStr); Map<Integer, Integer> turnCountDownCache = (Map<Integer, Integer>) phaseMap.get(dirStr);
turnCountDownCahce.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);
......
...@@ -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;
......
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