From a95076aac1aea933cd1a6bfff41df05143195ee0 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Thu, 11 Aug 2022 13:05:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E5=88=86=E8=B7=AF=E4=B8=8D?= =?UTF-8?q?=E8=89=AF=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../joylink/rtss/simulation/cbtc/data/status/SectionStatus.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SectionStatus.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SectionStatus.java index 2530a08c6..75aba9c32 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SectionStatus.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SectionStatus.java @@ -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; } From 214a4ae7d05ac7908e953d01a779e87bc475e031 Mon Sep 17 00:00:00 2001 From: tiger_zhou <123456> Date: Fri, 12 Aug 2022 09:37:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=97=E8=BD=A6=E8=BF=9B=E8=B7=AF?= =?UTF-8?q?=E5=BB=B6=E6=97=B6=E8=A7=A3=E9=94=81=E6=97=B6=E9=97=B4180S,?= =?UTF-8?q?=E8=B0=83=E8=BD=A6=E8=BF=9B=E8=B7=AF=E5=BB=B6=E6=97=B6=E8=A7=A3?= =?UTF-8?q?=E9=94=81=E4=B8=BA30S?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simulation/cbtc/CI/device/CiRouteService.java | 2 +- .../cbtc/data/map/DelayUnlockDevice.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java index 264a323b4..378943541 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java @@ -400,7 +400,7 @@ public class CiRouteService { } public void delayUnlockStart(Simulation simulation, Route route, DelayUnlockDevice device) { - device.delayUnlockStart(route); + device.delayUnlockStart(route, simulation.getRepository().getConfig()); route.setDelayUnlockDevice(device); this.signalControlService.tryControlSignalAspectAccordingLevel(simulation, route.getStart(), route.getStart().getDefaultAspect()); } diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/DelayUnlockDevice.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/DelayUnlockDevice.java index 4e91191d3..140c86fe6 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/DelayUnlockDevice.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/DelayUnlockDevice.java @@ -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; } From 8dcfce73544b25e7a139967d27be37b8b80fc2be Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Fri, 12 Aug 2022 09:50:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0<=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E9=80=9A=E7=9F=A5>=E4=BF=A1=E5=8F=B7=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../club/joylink/rtss/vo/map/graph/MapSignalButtonVO.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/club/joylink/rtss/vo/map/graph/MapSignalButtonVO.java b/src/main/java/club/joylink/rtss/vo/map/graph/MapSignalButtonVO.java index 78e2b18c4..1fdaffcba 100644 --- a/src/main/java/club/joylink/rtss/vo/map/graph/MapSignalButtonVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/graph/MapSignalButtonVO.java @@ -135,5 +135,9 @@ public class MapSignalButtonVO { * 解封按钮 */ UNBLOCK, + /** + * 故障通知 + */ + FAULT_NOTICE, } } From cc2c667e400bf9809b2828e379fde863a22a46d5 Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Fri, 12 Aug 2022 10:58:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E9=93=81?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=BF=9B=E8=B7=AF=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rtss/services/draftData/DraftMapRouteServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java index a8af03275..f0e2c2281 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java @@ -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 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()));