joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

【增加邻站进路办理】

Browse Source 
【修改指示灯状态不变化BUG】

Signed-off-by: weizhihong <weizhihong@joylink.club>
This commit is contained in:
weizhihong 2022-04-22 15:37:51 +08:00
parent 739ac78060
commit 83b92094c5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/AssistOperateHandler.java
View File

@ -25,9 +25,9 @@ public class AssistOperateHandler {
* @param label 按钮类型 * @param label 按钮类型
*/ */
@OperateHandlerMapping(type = Operation.Type.ASSIST_PRESS_DOWN_TURN_DIRECTION) @OperateHandlerMapping(type = Operation.Type.ASSIST_PRESS_DOWN_TURN_DIRECTION)
public void pressDownTurnDirection(Simulation simulation, String stationCode, DirectionLabelEnum label) { public void pressDownTurnDirection(Simulation simulation, String stationCode, DirectionLabelEnum labelEnum) {
assistService.changeButtonAspect(simulation, assistService.changeButtonAspect(simulation,
stationCode, label, ButtonTypeEnum.CHANGE_DIRECTION, Boolean.TRUE stationCode, labelEnum, ButtonTypeEnum.CHANGE_DIRECTION, Boolean.TRUE
, assistService.turnDirectionPressDownValid , assistService.turnDirectionPressDownValid
, assistService.turnDirectionPressDownDo); , assistService.turnDirectionPressDownDo);
} }
@ -40,9 +40,9 @@ public class AssistOperateHandler {
* @param label 按钮类型 * @param label 按钮类型
*/ */
@OperateHandlerMapping(type = Operation.Type.ASSIST_PRESS_UP_TURN_DIRECTION) @OperateHandlerMapping(type = Operation.Type.ASSIST_PRESS_UP_TURN_DIRECTION)
public void pressUpTurnDirection(Simulation simulation, String stationCode, DirectionLabelEnum label) { public void pressUpTurnDirection(Simulation simulation, String stationCode, DirectionLabelEnum labelEnum) {
assistService.changeButtonAspect(simulation, assistService.changeButtonAspect(simulation,
stationCode, label, ButtonTypeEnum.CHANGE_DIRECTION, Boolean.FALSE stationCode, labelEnum, ButtonTypeEnum.CHANGE_DIRECTION, Boolean.FALSE
, null , null
, assistService.turnDirectionPressUpDo); , assistService.turnDirectionPressUpDo);
} }

4
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/assist/AssistService.java
View File

@ -147,7 +147,7 @@ public class AssistService {
if (!CollectionUtils.isEmpty(nextStation.getIndicatorList())) { if (!CollectionUtils.isEmpty(nextStation.getIndicatorList())) {
nextStation.getIndicatorList() nextStation.getIndicatorList()
.stream() .stream()
.filter(indicator -> routeCode.equals(indicator.getCode())) .filter(indicator -> indicator.getRoute() != null && routeCode.equals(indicator.getRoute().getCode()))
.forEach(indicator -> { .forEach(indicator -> {
log.info(indicator.getCode() + indicator.getType()); log.info(indicator.getCode() + indicator.getType());
indicator.setChangeDirection(Boolean.FALSE); indicator.setChangeDirection(Boolean.FALSE);
@ -194,7 +194,7 @@ public class AssistService {
throw new SimulationException(SimulationExceptionType.Operation_Cannot_handed, "操作异常：未停靠列车"); throw new SimulationException(SimulationExceptionType.Operation_Cannot_handed, "操作异常：未停靠列车");
} }
// 判断本站台是否是接车站台 // 判断本站台是否是接车站台
boolean isReceive = sectionIndicator.getStand().isRight() == train.isRight(); boolean isReceive = button.getStand().isRight() == train.isRight();
if (!isReceive) { if (!isReceive) {
throw new SimulationException(SimulationExceptionType.Operation_Cannot_handed, "操作异常：非接车方向"); throw new SimulationException(SimulationExceptionType.Operation_Cannot_handed, "操作异常：非接车方向");
} }