Commit d591be93 authored by hanbing's avatar hanbing

方案管理,类型返回环式

parent 97fb9c21
...@@ -111,12 +111,8 @@ public class SchemeConfigServiceImpl implements SchemeConfigService { ...@@ -111,12 +111,8 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
List<SaveSchemeConfigDTO.PhaseScheme> phaseSchemeList = buildPhaseSchemeList(crossId); List<SaveSchemeConfigDTO.PhaseScheme> phaseSchemeList = buildPhaseSchemeList(crossId);
saveSchemeConfigDTO.setPhaseSchemeList(phaseSchemeList); saveSchemeConfigDTO.setPhaseSchemeList(phaseSchemeList);
// todo 暂时只有环式
saveSchemeConfigDTO.setTimeType(2);
// // 定义环式还是阶段式
// if (saveSchemeConfigDTO.getTimeType() == null) {
// saveSchemeConfigDTO.setTimeType();
// }
return saveSchemeConfigDTO; return saveSchemeConfigDTO;
} }
...@@ -290,13 +286,13 @@ public class SchemeConfigServiceImpl implements SchemeConfigService { ...@@ -290,13 +286,13 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
phaseListElement.setRedTime(crossPhasePO.getRedTime()); phaseListElement.setRedTime(crossPhasePO.getRedTime());
// 特殊控制 // 特殊控制
Integer controlMode = crossPhasePO.getControlMode(); Integer controlMode = crossPhasePO.getControlMode();
if (controlMode == 7) { if (controlMode == ControlModeConst.YELLOW_FLASH) {
phaseListElement.setYellowFlash(1); phaseListElement.setYellowFlash(1);
} else if (controlMode == 4) { } else if (controlMode == ControlModeConst.IS_RED) {
phaseListElement.setIsRed(1); phaseListElement.setIsRed(1);
} else if (controlMode == 2) { } else if (controlMode == ControlModeConst.IS_GREEN) {
phaseListElement.setIsGreen(1); phaseListElement.setIsGreen(1);
} else if (controlMode ==6) { } else if (controlMode == ControlModeConst.GREEN_FLASH) {
phaseListElement.setGreenFlash(1); phaseListElement.setGreenFlash(1);
} }
// 伴随相位的母相位列表 // 伴随相位的母相位列表
...@@ -606,7 +602,6 @@ public class SchemeConfigServiceImpl implements SchemeConfigService { ...@@ -606,7 +602,6 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
} }
} }
private void updateCrossPhaseLights(String crossId, private void updateCrossPhaseLights(String crossId,
SaveSchemeConfigDTO.PhaseListElement phase, SaveSchemeConfigDTO.PhaseListElement phase,
Integer phaseId) { Integer phaseId) {
......
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