From 46668187d1b4d7eede134e52fab4659f3242da44 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Fri, 26 Aug 2022 10:59:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E6=93=8D=E4=BD=9C=E5=8F=82=E6=95=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simulation/cbtc/training2/Operation2.java | 15 +++++++++++++++ .../rtss/vo/client/training2/Operation2VO.java | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/training2/Operation2.java b/src/main/java/club/joylink/rtss/simulation/cbtc/training2/Operation2.java index 34d551537..f55fb49d0 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/training2/Operation2.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/training2/Operation2.java @@ -149,8 +149,23 @@ public abstract class Operation2 { @Getter public static class ClientOperation2 extends Operation2 { + private String deviceCode; + + private String operationType; + + private String domId; + + private String cmdType; + + private String params; + public ClientOperation2(Operation2VO.ClientOperation2VO vo, Simulation simulation) { super(vo.getId()); + this.deviceCode = vo.getDeviceCode(); + this.operationType = vo.getOperationType(); + this.domId = vo.getDomId(); + this.cmdType = vo.getCmdType(); + this.params = vo.getParams(); if (vo.getTriggerCondition() != null) { this.setTriggerCondition(vo.getTriggerCondition().convert2BO(simulation.getRepository())); } diff --git a/src/main/java/club/joylink/rtss/vo/client/training2/Operation2VO.java b/src/main/java/club/joylink/rtss/vo/client/training2/Operation2VO.java index 4a96a2984..25375b033 100644 --- a/src/main/java/club/joylink/rtss/vo/client/training2/Operation2VO.java +++ b/src/main/java/club/joylink/rtss/vo/client/training2/Operation2VO.java @@ -66,6 +66,16 @@ public abstract class Operation2VO { @Setter @NoArgsConstructor public static class ClientOperation2VO extends Operation2VO { + private String deviceCode; + + private String operationType; + + private String domId; + + private String cmdType; + + private String params; + @Override public Operation2 convert2BO(Simulation simulation) { return new Operation2.ClientOperation2(this, simulation);