Commit bf15cd7e authored by hanbing's avatar hanbing

[update] 方案管理修改是否有行人灯判定方式

parent a3e0e14b
...@@ -369,7 +369,7 @@ public class SchemeConfigServiceImpl implements SchemeConfigService { ...@@ -369,7 +369,7 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
Integer type = crossLightsPO.getType(); Integer type = crossLightsPO.getType();
if (type >= 20 && type < 30) { if (type >= 20 && type < 30) {
Integer lightsId = crossLightsPO.getId(); Integer lightsId = crossLightsPO.getId();
if (hasLightsId(lightsId)) { if (hasLightsId(lightsId, phaseId, crossId)) {
dirListElement.setHasPersonPhase(1); dirListElement.setHasPersonPhase(1);
} }
} }
...@@ -428,12 +428,9 @@ public class SchemeConfigServiceImpl implements SchemeConfigService { ...@@ -428,12 +428,9 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
return laneList; return laneList;
} }
private boolean hasLightsId(Integer lightsId) { private boolean hasLightsId(Integer lightsId, Integer phaseId, String crossId) {
List<CrossPhaseLightsPO> crossPhaseLightsPOList = crossPhaseLightsMapper.selectByLightsId(lightsId); Integer id = crossPhaseLightsMapper.selectIdByThreeIds(lightsId, phaseId, crossId);
if (crossPhaseLightsPOList == null || crossPhaseLightsPOList.size() == 0) { return !ObjectUtil.isEmpty(id);
return false;
}
return true;
} }
private void handleRingTime(SaveSchemeConfigDTO saveSchemeConfigDTO) { private void handleRingTime(SaveSchemeConfigDTO saveSchemeConfigDTO) {
......
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