diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java b/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java index 4bd714960..e4cbb9e61 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java @@ -1217,7 +1217,7 @@ public class InterlockBuilder2 { if (!CollectionUtils.isEmpty(logicCodeList)) { for (String code : logicCodeList) { Section logic = ((Section) elementMap.get(code)); - Objects.requireNonNull(logic, String.format("编码为[%s]的区段不存在", code)); + errMsgList.add(String.format("编码为[%s]的区段不存在", code)); logicList.add(logic); } } diff --git a/src/main/java/club/joylink/rtss/vo/map/MapSwitchVO.java b/src/main/java/club/joylink/rtss/vo/map/MapSwitchVO.java index c864f152b..fd9c625b5 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapSwitchVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/MapSwitchVO.java @@ -26,6 +26,10 @@ public class MapSwitchVO { */ @NotBlank(message="道岔名称不能为空") private String name; + /** + * 转辙机型号 + */ + private String model; /** * 所属车站 编号