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

merge

Browse Source
This commit is contained in:
xiazengbin 2022-08-12 11:31:35 +08:00
commit fbcf1e645e
5 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java
View File

@ -478,7 +478,7 @@ public class DraftMapRouteServiceImpl implements DraftMapRouteService {
MapRouteNewVO departureRoute = routeVOMap.get(startEndSignalCode); //发车进路
BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertTrue(departureRoute.getName().startsWith("L"),
String.format("信号机[%s]的通过进路的发车进路[%s]不是列车进路", signal.getCode(), departureRoute.getCode()));
routeAspectVOS.add(new MapRouteAspectVO(departureRoute.getCode(), departureRoute.getSignalAspect()));
routeAspectVOS.add(new MapRouteAspectVO(departureRoute.getCode(), getAspectIndex(SignalAspect.Y)));
routeVO.setEndSectionCode(departureRoute.getEndSectionCode());
List<MapSignalButtonVO> buttons = signalCode_button_map.get(destination.getCode());
MapSignalButtonVO endButton = buttons.stream().filter(vo -> MapSignalButtonVO.Type.PICK.equals(vo.getType()))
@ -494,7 +494,7 @@ public class DraftMapRouteServiceImpl implements DraftMapRouteService {
BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertNotNull(receivingRoute,
String.format("[%s]接车进路不存在", startEndSignalCode));
routeVO.setStartSectionCode(receivingRoute.getStartSectionCode());
routeAspectVOS.add(new MapRouteAspectVO(receivingRoute.getCode(), receivingRoute.getSignalAspect()));
routeAspectVOS.add(new MapRouteAspectVO(receivingRoute.getCode(), getAspectIndex(SignalAspect.GY)));
outboundSignal = section.getSignalOf(right);
BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertNotNull(outboundSignal,
String.format("股道[%s]无出站信号机", section.getCode()));

1
src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java
View File

@ -743,3 +743,4 @@ public class CiRouteService {
}
}
}

15
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/DelayUnlockDevice.java
View File

@ -10,6 +10,21 @@ public abstract class DelayUnlockDevice extends MayOutOfOrderDevice {
super(code, name, deviceType);
}
public void delayUnlockStart(Route route,MapConfig mc) {
// route.getType() == Type
int baseDelayTime = route.getDelayReleaseTime();
if(mc.isRailway()){
switch (route.getType()){
case DEPARTURE:
case RECEIVING:
baseDelayTime = 180;
break;
case SHUNTING:
baseDelayTime = 30;
}
}
this.remain = baseDelayTime * 1000;
}
public void delayUnlockStart(Route route) {
this.remain = route.getDelayReleaseTime() * 1000;
}

1
src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SectionStatus.java
View File

@ -272,6 +272,7 @@ public class SectionStatus extends DeviceStatus {
statusVO.setDelayUnlock(delayUnlock);
statusVO.setClosed(closed);
statusVO.setFault(fault);
statusVO.setBadShunt(badShunt);
statusVO.setShuntingTypeList(this.shuntingTypeList);
return statusVO;
}

4
src/main/java/club/joylink/rtss/vo/map/graph/MapSignalButtonVO.java
View File

@ -135,5 +135,9 @@ public class MapSignalButtonVO {
* 解封按钮
*/
UNBLOCK,
/**
* 故障通知
*/
FAULT_NOTICE,
}
}