[update] 周期倒计时优化

signal-utc-service/src/main/java/net/wanji/utc/service/runninginfo/impl/HkLightsStatusServiceImpl.java

@@ -151,6 +151,10 @@ public class HkLightsStatusServiceImpl implements HkLightsStatusService {
                                 if (2 != vehicleStatus) { // 2红灯
                                     infoVo.setPhaseId(String.valueOf(phaseNo));
                                 }
+                                Integer runTime = phaseInfoPO.getRunTime();
+                                if (!Objects.equals(runTime, 0) && runTime <= phaseLength) {
+                                    infoVo.setCyclePhaseCountDown(phaseLength - runTime);
+                                }
                             }
                         }
                         infoVo.setPhaseMap(phaseMap);

signal-utc-service/src/main/java/net/wanji/utc/task/SignalStatusTask.java

@@ -70,18 +70,18 @@ public class SignalStatusTask {
                         RealTimeDataWebSocket webSocket = entry.getValue();
                         if (!CollectionUtils.isEmpty(lightsStatusVOS)) {
                             for (LightsStatusVO lightsStatusVO : lightsStatusVOS) {
-                                if (Objects.equals(lightsStatusVO.getCrossId(), crossId)) {
+                                if (Objects.equals(lightsStatusVO.getCrossId(), crossIdStr.split(",")[0])) {
                                     Integer coutTime = 0;
                                     if (Arrays.asList(2, 3, 4, 9).contains(Integer.valueOf(lightsStatusVO.getRunMode()))) {
                                         if (runModeTimeMap.isEmpty() || Objects.isNull(runModeTimeMap.get(crossId))) {
-                                            runModeTimeMap.put(crossId, coutTime);
+                                            runModeTimeMap.put(crossIdStr, coutTime);
                                         } else {
                                             Integer countTimeCahce = runModeTimeMap.get(crossId);
-                                            runModeTimeMap.put(crossId, ++countTimeCahce);
+                                            runModeTimeMap.put(crossIdStr, ++countTimeCahce);
                                         }
-                                        lightsStatusVO.setCycleCountDown(runModeTimeMap.get(crossId));
+                                        lightsStatusVO.setCycleCountDown(runModeTimeMap.get(crossIdStr));
                                     } else if (StringUtils.equals(lightsStatusVO.getRunMode(), "11")){
-                                        runModeTimeMap.remove(crossId);
+                                        runModeTimeMap.remove(crossIdStr);
                                     }
                                     try {
                                         webSocket.sendInfo(JSONObject.toJSONString(lightsStatusVOS, SerializerFeature.WriteMapNullValue), crossIdStr);

signal-utc-service/src/main/java/net/wanji/utc/vo/LightsStatusVO.java

@@ -38,6 +38,8 @@ public class LightsStatusVO extends BaseCrossInfo {
     //相位周期剩余时长
     @ApiModelProperty(value = "相位周期剩余时长")
     private Integer cycleCountDown;
+    @ApiModelProperty(value = "相位周期剩余时长")
+    private Integer cyclePhaseCountDown;
     //相位周期时长
     @ApiModelProperty(value = "相位周期时长")
     private Integer cycleLen;