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 2023-12-04 17:51:24 +08:00
parent b0d30ed58c
commit 2316deb8d3
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/club/joylink/rtss/simulation/cbtc/data/status/TrainStatus.java
View File

@ -141,6 +141,8 @@ public class TrainStatus extends DeviceStatus {
private int runningTime; private int runningTime;
private boolean parking;
private int parkingRemainTime; private int parkingRemainTime;
private String turnBackStrategy; private String turnBackStrategy;
@ -185,6 +187,7 @@ public class TrainStatus extends DeviceStatus {
this.startStation = train.getStartStation(); this.startStation = train.getStartStation();
this.endStation = train.getEndStation(); this.endStation = train.getEndStation();
this.runningTime = train.getRunningTimeInSeconds(); this.runningTime = train.getRunningTimeInSeconds();
this.parking = train.isParking();
this.parkingRemainTime = train.getParkingRemainTimeInSeconds(); this.parkingRemainTime = train.getParkingRemainTimeInSeconds();
this.turnBackStrategy = train.getTurnBackStrategy(); this.turnBackStrategy = train.getTurnBackStrategy();
this.turnBackStatus = train.getTurnBackStatus(); this.turnBackStatus = train.getTurnBackStatus();
@ -330,6 +333,11 @@ public class TrainStatus extends DeviceStatus {
status.setRunningTime(this.runningTime); status.setRunningTime(this.runningTime);
change = true; change = true;
} }
if (!Objects.equals(this.parking, train.isParking())) {
this.parking = train.isParking();
status.setParking(this.parking);
change = true;
}
if (!Objects.equals(this.parkingRemainTime, train.getParkingRemainTimeInSeconds())) { if (!Objects.equals(this.parkingRemainTime, train.getParkingRemainTimeInSeconds())) {
this.parkingRemainTime = train.getParkingRemainTimeInSeconds(); this.parkingRemainTime = train.getParkingRemainTimeInSeconds();
status.setParkingRemainTime(this.parkingRemainTime); status.setParkingRemainTime(this.parkingRemainTime);

3
src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainStatusVO.java
View File

@ -141,6 +141,8 @@ public class TrainStatusVO extends DeviceStatusVO {
private Integer runningTime; private Integer runningTime;
private Boolean parking;
private Integer parkingRemainTime; private Integer parkingRemainTime;
private String turnBackStrategy; private String turnBackStrategy;
@ -183,6 +185,7 @@ public class TrainStatusVO extends DeviceStatusVO {
this.startStation = train.getStartStation(); this.startStation = train.getStartStation();
this.endStation = train.getEndStation(); this.endStation = train.getEndStation();
this.runningTime = train.getRunningTime(); this.runningTime = train.getRunningTime();
this.parking = train.isParking();
this.parkingRemainTime = train.getParkingRemainTime(); this.parkingRemainTime = train.getParkingRemainTime();
this.turnBackStrategy = train.getTurnBackStrategy(); this.turnBackStrategy = train.getTurnBackStrategy();
this.turnBackStatus = train.getTurnBackStatus(); this.turnBackStatus = train.getTurnBackStatus();