Commit c1a64e06 authored by duanruiming's avatar duanruiming

[update] 优化代码6,优化讲台方案灯态定时任务程序可读性

parent 206eb2bd
......@@ -113,6 +113,27 @@ public class SignalStatus4StaticSchemeTask {
if (isNotNextSchemeNo(crossSchemePO)) {
continue;
}
initLightsStatus(crossId, code, lightsStatusVO, date, crossSchemePO, schemeNo);
}
}
}
}
} catch (Exception e) {
log.error("获取当前路口运行方案号失败:", e);
throw new Exception(e);
}
}
/**
* 初始化灯态信息
* @param crossId
* @param code
* @param lightsStatusVO
* @param date
* @param crossSchemePO
* @param schemeNo
*/
private static void initLightsStatus(String crossId, String code, LightsStatusVO lightsStatusVO, Date date, CrossSchemePO crossSchemePO, String schemeNo) {
List<CrossSchemePhaseCountDownDTO> crossSchemePhaseCountDownList = CrossSchemePhaseTimeCountCache.crossSchemePhaseCountDownList;
for (CrossSchemePhaseCountDownDTO crossSchemePhaseCountDownDTO : crossSchemePhaseCountDownList) {
if (StringUtils.equalsIgnoreCase(schemeNo, crossSchemePhaseCountDownDTO.getSchemeNo()) &&
......@@ -133,14 +154,6 @@ public class SignalStatus4StaticSchemeTask {
}
}
}
}
}
}
} catch (Exception e) {
log.error("获取当前路口运行方案号失败:", e);
throw new Exception(e);
}
}
private boolean isNotNextSchemeNo(CrossSchemePO crossSchemePO) {
if (Objects.nonNull(crossSchemePO)) {
......@@ -238,7 +251,7 @@ public class SignalStatus4StaticSchemeTask {
&& StringUtils.equalsIgnoreCase(schemeId, String.valueOf(turnPojo.getSchemeNo()))
&& StringUtils.equalsIgnoreCase(dirTurnPhaseNo, String.valueOf(turnPojo.getPhaseNo()))) {
Integer strphase = turnPojo.getPhaseNo();
Integer phaseNoStr = turnPojo.getPhaseNo();
if (Objects.nonNull(turnPojo.getDirTurnMap())) {
for (Map.Entry<Integer, List<CrossLightsPO>> entry : turnPojo.getDirTurnMap().entrySet()) {
......
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