From 4705b55abac02081432b9d2b2d6d2bc8bc883a48 Mon Sep 17 00:00:00 2001 From: Jade Date: Mon, 29 Nov 2021 16:34:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=20=E5=AE=9E?= =?UTF-8?q?=E8=AE=AD=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../training/generatornew/base/SectionGeneratorNew.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java b/src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java index 5f26c4c73..c53dccee0 100644 --- a/src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java +++ b/src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java @@ -115,7 +115,9 @@ public class SectionGeneratorNew implements GeneratorNew { // 设置区段故障锁闭(这只是区故解的一种情况,后面再补其他情况) // section.setFaultLock(true); section.setRouteLock(true); - if (section.isShowLogic()) { + if (section.isCross()) { + section.getLogicList().get(0).setRouteLock(true); + } else if (section.isShowLogic()) { section.getLogicList().forEach(s -> { // s.setFaultLock(true); s.setRouteLock(true); @@ -123,7 +125,7 @@ public class SectionGeneratorNew implements GeneratorNew { } break; case Section_Axis_Pre_Reset: - if(!section.isAxleCounter()){ + if(!section.isAxleCounter() && section.isCross()){ continue; } VirtualRealitySectionAxleCounter virtualAxleCounter = section.getVirtualAxleCounter();