区段 岔心
This commit is contained in:
parent
d916dc162e
commit
a5f30e905d
@ -466,9 +466,9 @@ public class Section extends DelayUnlockDevice {
|
|||||||
public void axleCounterOccupy(boolean right) {
|
public void axleCounterOccupy(boolean right) {
|
||||||
this.trainRight = right;
|
this.trainRight = right;
|
||||||
this.setNctOccupied(true);
|
this.setNctOccupied(true);
|
||||||
if (isSwitchAxleCounterSection()) {
|
// if (isSwitchAxleCounterSection()) {
|
||||||
nctOccupiedBySwitchPosition();
|
// nctOccupiedBySwitchPosition();
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1139,20 +1139,25 @@ public class Section extends DelayUnlockDevice {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.setInvalid(true);
|
this.setInvalid(true);
|
||||||
if (!CollectionUtils.isEmpty(this.logicList)) {
|
|
||||||
for (Section logic : this.logicList) {
|
|
||||||
logic.setInvalid(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (this.isSwitchAxleCounterSection()) { // 道岔计轴区段
|
if (this.isSwitchAxleCounterSection()) { // 道岔计轴区段
|
||||||
List<Switch> relSwitchList = this.getRelSwitchList();
|
List<Switch> relSwitchList = this.getRelSwitchList();
|
||||||
for (Switch aSwitch : relSwitchList) {
|
for (Switch aSwitch : relSwitchList) {
|
||||||
|
aSwitch.getA().setInvalid(true);
|
||||||
if (aSwitch.isPosN()) {
|
if (aSwitch.isPosN()) {
|
||||||
|
aSwitch.getB().setInvalid(true);
|
||||||
aSwitch.getC().setInvalid(false);
|
aSwitch.getC().setInvalid(false);
|
||||||
} else if (aSwitch.isPosR()) {
|
} else if (aSwitch.isPosR()) {
|
||||||
|
aSwitch.getC().setInvalid(true);
|
||||||
aSwitch.getB().setInvalid(false);
|
aSwitch.getB().setInvalid(false);
|
||||||
|
} else {
|
||||||
|
aSwitch.getB().setInvalid(true);
|
||||||
|
aSwitch.getC().setInvalid(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (!CollectionUtils.isEmpty(this.logicList)) {
|
||||||
|
for (Section logic : this.logicList) {
|
||||||
|
logic.setInvalid(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user