diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/RailDispatchCommand.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/RailDispatchCommand.java index 5d7b41103..a7511ab23 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/RailDispatchCommand.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/RailDispatchCommand.java @@ -27,6 +27,11 @@ public class RailDispatchCommand { */ private String title; + /** + * 正文 + */ + private String content; + /** * 命令号 */ @@ -79,11 +84,15 @@ public class RailDispatchCommand { */ private Map receiveInfoMap; + /** + * 全部受令人都已签收? + */ private boolean allSigned; public RailDispatchCommand(RailDispatchCommandVO vo) { this.id = vo.getId(); this.title = vo.getTitle(); + this.content = vo.getContent(); this.number = vo.getNumber(); this.sendTime = vo.getSendTime(); this.companyOfSender = vo.getCompanyOfSender(); diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/vo/RailDispatchCommandVO.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/vo/RailDispatchCommandVO.java index d5581ad3e..127f7900d 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/vo/RailDispatchCommandVO.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/vo/RailDispatchCommandVO.java @@ -2,6 +2,7 @@ package club.joylink.rtss.simulation.cbtc.CTC.data.vo; import club.joylink.rtss.simulation.cbtc.CTC.data.RailDispatchCommand; import club.joylink.rtss.util.JsonUtils; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; @@ -29,6 +30,11 @@ public class RailDispatchCommandVO { */ private String title; + /** + * 正文 + */ + private String content; + /** * 命令号 */ @@ -38,6 +44,7 @@ public class RailDispatchCommandVO { * 发令时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime sendTime; /** @@ -54,6 +61,7 @@ public class RailDispatchCommandVO { * 授权时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime authorizationTime; /** @@ -65,6 +73,7 @@ public class RailDispatchCommandVO { * 定稿时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime finalizationTime; /** @@ -83,10 +92,13 @@ public class RailDispatchCommandVO { private Set receiverIds; /** - * 受令人(仿真成员)。调用接口时不必给该字段赋值 + * 受令人的签收信息(仿真成员)。调用接口时不给该字段赋值 */ private Map receiverInfos; + /** + * 调度命令类型(正常调度命令)等 + */ private RailDispatchCommand.Type type; /** @@ -106,6 +118,7 @@ public class RailDispatchCommandVO { public RailDispatchCommandVO(RailDispatchCommand command) { this.id = command.getId(); this.title = command.getTitle(); + this.content = command.getContent(); this.number = command.getNumber(); this.sendTime = command.getSendTime(); this.senderId = command.getSenderId();