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

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

Browse Source
This commit is contained in:
thesai 2021-11-26 09:25:58 +08:00
commit bc2d84dfd0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java
View File

@ -61,6 +61,9 @@ public class SectionGeneratorNew implements GeneratorNew {
if (section.isCross() && !sectionTypes.contains(BusinessConsts.Section.SectionType.Type05)) { if (section.isCross() && !sectionTypes.contains(BusinessConsts.Section.SectionType.Type05)) {
continue; continue;
} }
if (section.getParent() != null && section.getParent().isCross()) {
continue;
}
} }
switch (Operation.Type.valueOf(operateDefinitionVO.getOperateType())) { switch (Operation.Type.valueOf(operateDefinitionVO.getOperateType())) {

2
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
View File

@ -510,7 +510,7 @@ public class Section extends DelayUnlockDevice {
* @return * @return
*/ */
public boolean isLogicSection() { public boolean isLogicSection() {
return !this.physical && !this.axleCounter && Objects.nonNull(this.parent); return !this.physical && !this.axleCounter && !this.isCross() && Objects.nonNull(this.parent);
} }
/** /**