【大铁出入口判断进路开放逻辑修改】
This commit is contained in:
parent
a3d245346f
commit
581def3bb3
@ -1,5 +1,7 @@
|
|||||||
package club.joylink.rtss.simulation.cbtc.CI.device;
|
package club.joylink.rtss.simulation.cbtc.CI.device;
|
||||||
|
|
||||||
|
import club.joylink.rtss.constants.DirectionLabelEnum;
|
||||||
|
import club.joylink.rtss.simulation.cbtc.CI.data.StationDirection;
|
||||||
import club.joylink.rtss.simulation.cbtc.Simulation;
|
import club.joylink.rtss.simulation.cbtc.Simulation;
|
||||||
import club.joylink.rtss.simulation.cbtc.data.map.*;
|
import club.joylink.rtss.simulation.cbtc.data.map.*;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@ -7,6 +9,7 @@ import org.springframework.stereotype.Component;
|
|||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Component
|
@Component
|
||||||
@ -178,11 +181,15 @@ public class CiService {
|
|||||||
boolean isCanHandle = simulation.getRepository().getStationList().stream()
|
boolean isCanHandle = simulation.getRepository().getStationList().stream()
|
||||||
.filter(station -> station.getCode().equals(route.getStart().getStation().getCode())
|
.filter(station -> station.getCode().equals(route.getStart().getStation().getCode())
|
||||||
|| station.getCode().equals(route.getDestination().getStation().getCode()))
|
|| station.getCode().equals(route.getDestination().getStation().getCode()))
|
||||||
.anyMatch(station ->
|
.anyMatch(station -> {
|
||||||
station.getStationDirectionMap().values().stream()
|
Map<DirectionLabelEnum, StationDirection> stationDirectionMap = station.getStationDirectionMap();
|
||||||
.filter(stationDirection -> !CollectionUtils.isEmpty(stationDirection.getCurrentRouteList()))
|
if (CollectionUtils.isEmpty(stationDirectionMap)) {
|
||||||
.anyMatch(stationDirection -> stationDirection.getCurrentRouteList().contains(route))
|
return true;
|
||||||
);
|
}
|
||||||
|
return stationDirectionMap.values().stream()
|
||||||
|
.filter(stationDirection -> !CollectionUtils.isEmpty(stationDirection.getCurrentRouteList()))
|
||||||
|
.anyMatch(stationDirection -> stationDirection.getCurrentRouteList().contains(route));
|
||||||
|
});
|
||||||
if (!isCanHandle) {
|
if (!isCanHandle) {
|
||||||
return level;
|
return level;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user