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

新增：StandStatus增加折返策略

Browse Source
This commit is contained in:
joylink_zhangsai 2021-06-30 15:18:54 +08:00
parent 18fbefcee7
commit ffbb75ea4d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StandStatus.java
View File

@ -117,6 +117,7 @@ public class StandStatus extends DeviceStatus {
this.trainLimit = stand.getTrainLimit(); this.trainLimit = stand.getTrainLimit();
this.parkingTime = stand.getParkingTime(); this.parkingTime = stand.getParkingTime();
this.parkingAlwaysValid = stand.isParkingAlwaysValid(); this.parkingAlwaysValid = stand.isParkingAlwaysValid();
this.typeStrategy = stand.getTypeStrategy();
this.noStatus = stand.isNoStatus(); this.noStatus = stand.isNoStatus();
this.closed = stand.isClosed(); this.closed = stand.isClosed();
this.fault = Objects.nonNull(stand.getFault())?((Stand.Fault)stand.getFault()).name():null; this.fault = Objects.nonNull(stand.getFault())?((Stand.Fault)stand.getFault()).name():null;
@ -214,6 +215,11 @@ public class StandStatus extends DeviceStatus {
status.setParkingAlwaysValid(this.parkingAlwaysValid); status.setParkingAlwaysValid(this.parkingAlwaysValid);
change = true; change = true;
} }
if (!Objects.equals(this.typeStrategy, stand.getTypeStrategy())) {
this.typeStrategy = stand.getTypeStrategy();
status.setTypeStrategy(this.typeStrategy);
change = true;
}
if (!Objects.equals(this.noStatus, stand.isNoStatus())) { if (!Objects.equals(this.noStatus, stand.isNoStatus())) {
this.noStatus = stand.isNoStatus(); this.noStatus = stand.isNoStatus();
status.setNoStatus(noStatus); status.setNoStatus(noStatus);

4
src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/StandStatusVO.java
View File

@ -77,6 +77,8 @@ public class StandStatusVO extends DeviceStatusVO {
@JsonSerialize(using = Boolean2NumSerializer.class) @JsonSerialize(using = Boolean2NumSerializer.class)
private Boolean parkingAlwaysValid; private Boolean parkingAlwaysValid;
private Stand.TurnBackType typeStrategy;
@JsonSerialize(using = Boolean2NumSerializer.class) @JsonSerialize(using = Boolean2NumSerializer.class)
private Boolean noStatus; private Boolean noStatus;
@ -84,7 +86,7 @@ public class StandStatusVO extends DeviceStatusVO {
private Boolean closed; private Boolean closed;
/**故障*/ /**故障*/
@JsonInclude(JsonInclude.Include.ALWAYS) @JsonInclude()
private String fault; private String fault;
public StandStatusVO(Stand stand) { public StandStatusVO(Stand stand) {