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

修改进路区段限速判断

Browse Source
This commit is contained in:
joylink_zhangsai 2021-07-29 17:31:32 +08:00
parent 1fd9d1230c
commit 6d7bb118ae
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/TempSpeedLimitService.java
View File

@ -24,7 +24,6 @@ public class TempSpeedLimitService {
* 区段设置临时限速
*/
public void setSectionLimitSpeed(Simulation simulation, Section section, int limitSpeed) {
section.setSpeedUpLimit(limitSpeed);
if (section.isSwitchTrack()) {
this.setSwitchLimitSpeed(simulation, section.getRelSwitch(), limitSpeed);
} else if (section.isCross()) {

9
src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/RouteService.java
View File

@ -1051,6 +1051,15 @@ public class RouteService {
route.debugStr(), section.debugStr()));
return level;
}
if (!CollectionUtils.isEmpty(section.getLogicList())) {
for (Section logic : section.getLogicList()) {
if (logic.getSpeedUpLimit() != -1) {
log.info(String.format("进路[%s]连锁条件检查失败：区段[%s]限速",
route.debugStr(), logic.debugStr()));
return level;
}
}
}
}
// // 屏蔽门
// if (!CollectionUtils.isEmpty(route.getPsdList())) {