Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/StationDirectionOperateHandler.java
This commit is contained in:
joylink_zhangsai 2022-05-11 14:58:08 +08:00
commit 379baf50d0

View File

@ -122,12 +122,11 @@ public class StationDirectionOperateHandler {
* @param simulation 仿真数据
* @param stationCode 车站编码
* @param labelEnum 运行方向
* @param pressDown 按下1抬起0
*/
@OperateHandlerMapping(type = Operation.Type.ASSIST_PRESS_ACCIDENT)
public void pressAccidentBtn(Simulation simulation, String stationCode, DirectionLabelEnum labelEnum, Integer pressDown) {
public void pressAccidentBtn(Simulation simulation, String stationCode, DirectionLabelEnum labelEnum) {
ButtonThenInterface thenInterface = stationDirectionService.getThenMethodByType(Operation.Type.ASSIST_PRESS_ACCIDENT);
stationDirectionService.changeButtonAspect(simulation, stationCode, labelEnum
, StationDirection.ButtonTypeEnum.ACCIDENT, true, null, thenInterface);
, StationDirection.ButtonTypeEnum.ACCIDENT, Boolean.TRUE, null, thenInterface);
}
}