From 379281a8a8d9900857b03fcf83fc5d6e75398775 Mon Sep 17 00:00:00 2001 From: xzb <223@qq.com> Date: Tue, 13 Sep 2022 10:18:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=91=BD=E4=BB=A4-=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B3=A8=E9=87=8A=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/simulation/SimulationV1Controller.java | 8 ++++---- .../joylink/rtss/simulation/cbtc/CTC/rail/cmd/DisCmd.java | 6 +++--- .../cbtc/CTC/rail/cmd/vo/DisCmdRcvCompanyVo.java | 6 +++--- .../rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdRspVo.java | 2 +- .../cbtc/CTC/rail/cmd/vo/DisCmdSendCompanyVo.java | 4 ++-- .../rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdSrcVo.java | 2 +- .../cbtc/CTC/rail/cmd/vo/FindAllDisCmdForHolderRspVo.java | 2 +- .../rtss/simulation/cbtc/CTC/rail/cmd/vo/ReceiptVo.java | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) 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 813a858ac..9636a0a8e 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java @@ -42,10 +42,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; import java.time.LocalTime; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; /** * 新仿真接口 @@ -201,6 +198,9 @@ public class SimulationV1Controller { @PostMapping("/{group}/operate/{type}") public Object operate(@PathVariable @NotBlank String group, @PathVariable @NotNull String type, @RequestBody(required = false) Map param, @RequestAttribute AccountVO user) { + if(null == param){ + param = new HashMap<>(); + } return this.groupSimulationService.operate(group, type, param, user); } diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/DisCmd.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/DisCmd.java index c54a8ff38..9c877974f 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/DisCmd.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/DisCmd.java @@ -96,7 +96,7 @@ public class DisCmd { /** * 转发调度命令 */ - Trans, + Forward, /** * 请求调度命令 */ @@ -104,11 +104,11 @@ public class DisCmd { /** * 长效调度命令 */ - Long, + LongTerm, /** * 班计划调度命令 */ - Plan, + ShiftScheduling, /** * 其他调度命令 */ diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdRcvCompanyVo.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdRcvCompanyVo.java index eaca699ff..b015c85fb 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdRcvCompanyVo.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdRcvCompanyVo.java @@ -20,7 +20,7 @@ public class DisCmdRcvCompanyVo { */ private String id; /** - * 受令单位类型 + * 受令单位类型[Dispatcher(调度台) Station(车站) Train(无线机车) Tsr(列控服务器)] * @see DisCmdRcvCompany.Type */ private String type = "Undefined"; @@ -62,7 +62,7 @@ public class DisCmdRcvCompanyVo { private String trainCode; /////////////////////运行时数据////////////////// /** - * 最终受令端对于调度命令的状态 + * 最终受令端对于调度命令的状态[Received(接收) Signed(签收) Reject(拒签)] * @see DisCmdRcvCompany.Status */ private String state = "Undefined"; @@ -80,7 +80,7 @@ public class DisCmdRcvCompanyVo { */ private String signBy; /** - * 无线调度命令的中转站对调度命令的状态 + * 无线调度命令的中转站对调度命令的状态[Received(接收) Sent(发送)] * @see DisCmdRcvCompany.TransStatus */ private String transStatus = "Undefined"; diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdRspVo.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdRspVo.java index 3be449395..f533514d9 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdRspVo.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdRspVo.java @@ -70,7 +70,7 @@ public class DisCmdRspVo { */ private String designer; /** - * 调度命令类型 + * 调度命令类型[Normal(普通调度命令) Construct(施工调度命令) Forward(转发调度命令) Request(请求调度命令) LongTerm(长效调度命令) ShiftScheduling(班计划调度命令) Other(其他调度命令)] * @see DisCmd.Type */ private String type = "Undefined"; diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdSendCompanyVo.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdSendCompanyVo.java index 82c21d958..c334de30e 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdSendCompanyVo.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdSendCompanyVo.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; public class DisCmdSendCompanyVo { /** - * 发令单位类型 + * 发令单位类型[Dispatcher(调度台) Station(车站)] * @see DisCmdSendCompany.Type */ private String type = "Undefined"; @@ -31,7 +31,7 @@ public class DisCmdSendCompanyVo { private String disCmdCode; //////////////////运行时数据//////////////// /** - * 调度命令对应发令单的状态 + * 调度命令对应发令单的状态[Cache(缓存) Send(发送) Signed(签收完成)] * @see DisCmdSendCompany.Status */ private String state = "Undefined"; diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdSrcVo.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdSrcVo.java index 60006c61f..ee23548a0 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdSrcVo.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/DisCmdSrcVo.java @@ -51,7 +51,7 @@ public class DisCmdSrcVo { */ private String designer; /** - * 调度命令类型 + * 调度命令类型[Normal(普通调度命令) Construct(施工调度命令) Forward(转发调度命令) Request(请求调度命令) LongTerm(长效调度命令) ShiftScheduling(班计划调度命令) Other(其他调度命令)] * @see DisCmd.Type */ private String type = "Undefined"; diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/FindAllDisCmdForHolderRspVo.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/FindAllDisCmdForHolderRspVo.java index ad53aaa98..e28c9e4d1 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/FindAllDisCmdForHolderRspVo.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/FindAllDisCmdForHolderRspVo.java @@ -13,7 +13,7 @@ import java.util.Map; public class FindAllDisCmdForHolderRspVo { ///////////////////////调度命令持有者相关信息///////////////////////// /** - * 持有者类型 + * 持有者类型[Dispatcher(调度台) Station(车站) Train(无线机车) Tsr(列控服务器)] */ private DisCmdHolderEnum holderType; /** diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/ReceiptVo.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/ReceiptVo.java index 445911dec..316605408 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/ReceiptVo.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/cmd/vo/ReceiptVo.java @@ -14,7 +14,7 @@ public class ReceiptVo { */ private String disCmdCode; /** - * 回执状态 + * 回执状态[Sent(已发送) AllSigned(已全部签收) Received(已接收) Signed(已签收) ProxySigned(已代签) Read(已阅读) Rejected(已拒签)] * @see ReceiptVo.Status */ private String state;