diff --git a/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java b/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java index 7714f4ed2..c66102721 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java @@ -199,7 +199,7 @@ public class SimulationV1Controller { */ @PostMapping("/{group}/operate/{type}") public Object operate(@PathVariable @NotBlank String group, @PathVariable @NotNull String type, - @RequestBody Map param, @RequestAttribute AccountVO user) { + @RequestBody(required = false) Map param, @RequestAttribute AccountVO user) { return this.groupSimulationService.operate(group, type, param, user); } diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/service/CtcDispatchCommandService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/service/CtcDispatchCommandService.java index b4255122c..3fde0ef04 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/service/CtcDispatchCommandService.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/service/CtcDispatchCommandService.java @@ -61,10 +61,10 @@ public class CtcDispatchCommandService { = new WebSocketMessage<>(RailDispatchCommandVO.WsMsgType.ADD, newVO); SocketMessageVO> message = SocketMessageFactory.buildDispatchCommandMessage(simulation.getId(), messageBody); - //发送给发送者 - String senderUserId = command.getSender().getUserId(); -// newVO.setGroup(RailDispatchCommandVO.Group.SEND); - stompMessageService.sendToUser(senderUserId, message); +// //发送给发送者 +// String senderUserId = command.getSender().getUserId(); +//// newVO.setGroup(RailDispatchCommandVO.Group.SEND); +// stompMessageService.sendToUser(senderUserId, message); //发送给接收者 Set receiverUserIds = command.getReceiverUserIds(); // newVO.setGroup(RailDispatchCommandVO.Group.RECEIVE); diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SectionStatus.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SectionStatus.java index 986d12d22..2530a08c6 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SectionStatus.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SectionStatus.java @@ -94,18 +94,36 @@ public class SectionStatus extends DeviceStatus { @JsonSerialize(using = Boolean2NumSerializer.class) private boolean preReset; + /** + * 延时解锁? + */ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean delayUnlock; + /** + * 关闭(关闭后列车不能进入该区段,已在该区段的紧急制动) + */ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean closed; + /** + * 延时解锁剩余时间 + */ private int remain; + /** + * 故障 + */ private String fault; + /** + * 分路不良类型(大铁) + */ private List shuntingTypeList; + /** + * 分路不良状态(大铁) + */ private boolean badShunt; public SectionStatus(Section section) { diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SignalStatus.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SignalStatus.java index a0be3def3..0d0bd29d1 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SignalStatus.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SignalStatus.java @@ -52,18 +52,23 @@ public class SignalStatus extends DeviceStatus { /** 信号机延时解锁倒计时 */ private Integer remainTime; + /** 无状态(灰显) */ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean noStatus; + /** 行调无状态 */ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean atsNoStatus; + /** 接近锁闭 */ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean approachLock; + /** 延续保护锁闭 */ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean overlapLock; + /** 引导信号剩余时长 */ private int guideTime; /**故障*/ diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StandStatus.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StandStatus.java index 8f3a6a5f0..ca43dc9dc 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StandStatus.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StandStatus.java @@ -43,6 +43,7 @@ public class StandStatus extends DeviceStatus { @JsonSerialize(using = Boolean2NumSerializer.class) private boolean sysHoldTrain; + /** IBP盘扣车 */ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean ibpHoldTrain; @@ -74,12 +75,14 @@ public class StandStatus extends DeviceStatus { /**停车时间(自动为-1)*/ private int parkingTime; + /** 列车-停站时间map */ private Map parkingTimeMap; /**停车设置状态(一直有效/一次有效)*/ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean parkingAlwaysValid; + /** 折返类型策略(无折返/自动换端/无人折返) */ private Stand.TurnBackType typeStrategy; @JsonSerialize(using = Boolean2NumSerializer.class) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StationStatus.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StationStatus.java index 6e2725db1..38ffdcedc 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StationStatus.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StationStatus.java @@ -76,14 +76,17 @@ public class StationStatus extends DeviceStatus { */ private int preResetValidDuration; + /** 联锁机启动中 */ private boolean interlockMachineStarting; + /** S方向引导总锁(大铁) */ private boolean sGuideMasterLock; + /** X方向引导总锁(大铁) */ private boolean xGuideMasterLock; /** - * 允许自律 + * 允许自律(大铁) */ private boolean allowAutonomy; diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SwitchStatus.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SwitchStatus.java index 4498023a4..3ba0ddd88 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SwitchStatus.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SwitchStatus.java @@ -56,12 +56,15 @@ public class SwitchStatus extends DeviceStatus { */ private int delayTime; + /** 无状态(灰显) */ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean noStatus; + /** 行调界面无状态 */ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean atsNoStatus; + /** 预复位 */ @JsonSerialize(using = Boolean2NumSerializer.class) private boolean preReset;