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:
walker-sheng 2021-03-23 18:27:31 +08:00
parent 064e46b47a
commit 1e82fe9b97
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java
View File

@ -1422,6 +1422,7 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
String.format("O_%s_%s", end.getName(), deviceName)); String.format("O_%s_%s", end.getName(), deviceName));
routeOverlap.setPathList(Arrays.asList(sectionPath)); routeOverlap.setPathList(Arrays.asList(sectionPath));
routeOverlap.setSection(signalSection); routeOverlap.setSection(signalSection);
routeOverlap.setSignal(end);
routeOverlap.setRight(right); routeOverlap.setRight(right);
routeOverlap.setDelayReleaseTime(config.getOverlapReleaseTime()); // 默认延时解锁时间 routeOverlap.setDelayReleaseTime(config.getOverlapReleaseTime()); // 默认延时解锁时间
@ -1468,6 +1469,7 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
routeOverlap.setPathList(overlapPathList); routeOverlap.setPathList(overlapPathList);
routeOverlap.setSection(signalSection); routeOverlap.setSection(signalSection);
routeOverlap.setDelayReleaseTime(config.getOverlapReleaseTime()); // 默认延时解锁时间 routeOverlap.setDelayReleaseTime(config.getOverlapReleaseTime()); // 默认延时解锁时间
routeOverlap.setSignal(end);
routeOverlap.setRight(right); routeOverlap.setRight(right);
// 是否触发式延续保护 // 是否触发式延续保护
if (config.isOverlapSettingByTrigger()) { if (config.isOverlapSettingByTrigger()) {

9
src/main/java/club/joylink/rtss/vo/client/map/newmap/MapOverlapVO.java
View File

@ -1,11 +1,11 @@
package club.joylink.rtss.vo.client.map.newmap; package club.joylink.rtss.vo.client.map.newmap;
import club.joylink.rtss.entity.DraftMapOverlap;
import club.joylink.rtss.simulation.cbtc.data.map.RouteOverlap;
import club.joylink.rtss.util.JsonUtils;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import club.joylink.rtss.simulation.cbtc.data.map.RouteOverlap;
import club.joylink.rtss.entity.DraftMapOverlap;
import club.joylink.rtss.util.JsonUtils;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
@ -56,6 +56,8 @@ public class MapOverlapVO {
@NotBlank(message = "解锁区段code不能为空") @NotBlank(message = "解锁区段code不能为空")
private String unlockSectionCode; private String unlockSectionCode;
private String signalCode;
@ApiModelProperty(value = "是否右向", required = true) @ApiModelProperty(value = "是否右向", required = true)
private boolean right; private boolean right;
@ -103,6 +105,7 @@ public class MapOverlapVO {
vo.setName(overlap.getName()); vo.setName(overlap.getName());
vo.setUnlockTime(overlap.getDelayReleaseTime()); vo.setUnlockTime(overlap.getDelayReleaseTime());
vo.setUnlockSectionCode(overlap.getSection().getCode()); vo.setUnlockSectionCode(overlap.getSection().getCode());
vo.setSignalCode(overlap.getSignal().getCode());
vo.setRight(overlap.isRight()); vo.setRight(overlap.isRight());
vo.setPathList(MapSectionPathVO.convertBO2VOList(overlap.getPathList())); vo.setPathList(MapSectionPathVO.convertBO2VOList(overlap.getPathList()));
if (!CollectionUtils.isEmpty(overlap.getTriggerPathList())) { if (!CollectionUtils.isEmpty(overlap.getTriggerPathList())) {