joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1

Browse Source
This commit is contained in:
xzb 2022-08-26 11:30:37 +08:00
commit 410deb28e3
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/club/joylink/rtss/simulation/cbtc/training2/Operation2.java
View File

@ -149,8 +149,23 @@ public abstract class Operation2 {
@Getter @Getter
public static class ClientOperation2 extends Operation2 { 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) { public ClientOperation2(Operation2VO.ClientOperation2VO vo, Simulation simulation) {
super(vo.getId()); 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) { if (vo.getTriggerCondition() != null) {
this.setTriggerCondition(vo.getTriggerCondition().convert2BO(simulation.getRepository())); this.setTriggerCondition(vo.getTriggerCondition().convert2BO(simulation.getRepository()));
} }

10
src/main/java/club/joylink/rtss/vo/client/training2/Operation2VO.java
View File

@ -66,6 +66,16 @@ public abstract class Operation2VO {
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
public static class ClientOperation2VO extends Operation2VO { public static class ClientOperation2VO extends Operation2VO {
private String deviceCode;
private String operationType;
private String domId;
private String cmdType;
private String params;
@Override @Override
public Operation2 convert2BO(Simulation simulation) { public Operation2 convert2BO(Simulation simulation) {
return new Operation2.ClientOperation2(this, simulation); return new Operation2.ClientOperation2(this, simulation);