diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java index e602b6e1e..8b2c1ab30 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java @@ -25,6 +25,15 @@ public class LauncherNew implements IAction { private Long securityId; @JsonIgnore private Long userId; + @ApiModelProperty(value = "Секция", example = "AAA") + @JsonProperty + private String section; + @ApiModelProperty(value = "Тип клиринговой сессии", example = "AAA") + @JsonProperty + private String sessionType; + @ApiModelProperty(value = "Клиринговая сессия", example = "AAA") + @JsonProperty + private Long sessionId; @Override public Object toRequest() { @@ -33,6 +42,9 @@ public class LauncherNew implements IAction { taskRunnerCommandRequest.setCompanyId(companyId); taskRunnerCommandRequest.setSecurityId(securityId); taskRunnerCommandRequest.setUserId(userId); + taskRunnerCommandRequest.setSection(section); + taskRunnerCommandRequest.setSessionType(sessionType); + taskRunnerCommandRequest.setSessionId(sessionId); return taskRunnerCommandRequest; } @@ -45,7 +57,7 @@ public class LauncherNew implements IAction { @Override public Collection validate() { if (task == null) { - return List.of(new EnumMessage(BackEndError.ValidationError,"url parameter 'task-code'")); + return List.of(new EnumMessage(BackEndError.ValidationError, "url parameter 'task-code'")); } return Collections.emptyList(); } @@ -81,4 +93,28 @@ public class LauncherNew implements IAction { public void setSecurityId(Long securityId) { this.securityId = securityId; } + + public String getSection() { + return section; + } + + public void setSection(String section) { + this.section = section; + } + + public String getSessionType() { + return sessionType; + } + + public void setSessionType(String sessionType) { + this.sessionType = sessionType; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } } diff --git a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java index a93cfc534..41aad587b 100644 --- a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java +++ b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java @@ -67,6 +67,9 @@ class LauncherServiceTest extends AbstractServiceTest { launcherCommandRequest.setUserId(launcher.getSenderId()); launcherCommandRequest.setCompanyId(newCompanyId); launcherCommandRequest.setSecurityId(testSecurityId); + launcherCommandRequest.setSection("SECT"); + launcherCommandRequest.setSessionType("STYPE"); + launcherCommandRequest.setSessionId(111111L); BaseRequest predictableBaseRequest = new BaseRequest<>(); predictableBaseRequest.setRequestPayload(launcherCommandRequest); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java index b05686017..1a79897e4 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java @@ -12,6 +12,12 @@ public class LauncherCommandRequest { private Long companyId; @JsonProperty private Long securityId; + @JsonProperty + private String section; + @JsonProperty + private String sessionType; + @JsonProperty + private Long sessionId; public Long getUserId() { @@ -45,4 +51,28 @@ public class LauncherCommandRequest { public void setSecurityId(Long securityId) { this.securityId = securityId; } + + public String getSection() { + return section; + } + + public void setSection(String section) { + this.section = section; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getSessionType() { + return sessionType; + } + + public void setSessionType(String sessionType) { + this.sessionType = sessionType; + } }