From e00262ceb9f6f2b62f04b9a210005ca407534fce Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Tue, 19 Jan 2021 18:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=A0=E8=BE=93=E4=BF=A1=E5=8F=B7=E6=9C=BA?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=88=90=E8=81=94=E9=94=81=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/draftData/DraftMapCiDataGeneratorImpl.java | 3 ++- .../club/joylink/rtss/simulation/cbtc/data/map/Signal.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java index bb5b10d3f..1e365d95a 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java @@ -187,8 +187,9 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator { List approachList = new ArrayList<>(); log.info(String.format("共有信号机[%s]个", signalList.size())); for (Signal signal : signalList) { - if (signal.isBlockingSignal()) { + if (signal.isBlockingSignal() || signal.isTransmissionSignal()) { // 阻挡信号机永远红灯，不生成联锁 + // 传输信号机不需要生成联锁 continue; } // 信号机接近区段构建 diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java index 6e9ff2745..c6041745b 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java @@ -339,6 +339,13 @@ public class Signal extends MayOutOfOrderDevice { return Objects.equals(this.type, SignalType.PROTECTION); } + /** + * 是否传输信号机 + */ + public boolean isTransmissionSignal() { + return SignalType.TRANSMISSION.equals(this.type); + } + /** * 是否与轨道常规运行方向相反 *