From b469c162b22754e2f2fb7dc10ee45dff7c737bb6 Mon Sep 17 00:00:00 2001 From: etreshenkov Date: Thu, 6 Jul 2023 19:03:20 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-408 --- .../ru/spcex/clearing/session/stage/FinalMkrSession.java | 1 + .../clearing/session/stage/IntermediateMkrSession.java | 1 + .../clearing/session/stage/PrimaryAuctionB0Session.java | 1 + .../clearing/session/stage/PrimaryAuctionBnSession.java | 1 + .../clearing/session/stage/PrimaryAuctionT0Session.java | 1 + .../session/stage/SecondaryAuctionT0Session.java | 1 + .../clearing/session/stage/impl/FinishingSession.java | 6 +++--- .../session/stage/task/FinishingSessionPayload.java | 9 +++++++++ 8 files changed, 18 insertions(+), 3 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java index cc4c20f1b..b2d656dc6 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java @@ -219,6 +219,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean { FinishingSessionPayload payload = new FinishingSessionPayload(); payload.setSessionId(currSession.getId()); + payload.setPr("3"); runStage(TaskType.FinishingSession, payload, finishingSession); } //stage 11 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java index cf46e742c..513e7ec46 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java @@ -189,6 +189,7 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ { FinishingSessionPayload payload = new FinishingSessionPayload(); payload.setSessionId(currSession.getId()); + payload.setPr("4"); runStage(TaskType.FinishingSession, payload, finishingSession); } //stage 11 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java index 4eb10af79..3aef03d6e 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java @@ -178,6 +178,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali { FinishingSessionPayload payload = new FinishingSessionPayload(); payload.setSessionId(currSession.getId()); + payload.setPr("0"); runStage(TaskType.FinishingSession, payload, finishingSession); } //stage 11 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java index 13b5d48b3..4da10638e 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java @@ -177,6 +177,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali { FinishingSessionPayload payload = new FinishingSessionPayload(); payload.setSessionId(currSession.getId()); + payload.setPr("0"); runStage(TaskType.FinishingSession, payload, finishingSession); } //stage 11 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java index 6393e37fe..52c16d43c 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java @@ -177,6 +177,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali { FinishingSessionPayload payload = new FinishingSessionPayload(); payload.setSessionId(currSession.getId()); + payload.setPr("0"); runStage(TaskType.FinishingSession, payload, finishingSession); } //stage 11 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java index ef0a1414b..18ddce14f 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java @@ -178,6 +178,7 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia { FinishingSessionPayload payload = new FinishingSessionPayload(); payload.setSessionId(currSession.getId()); + payload.setPr("1"); runStage(TaskType.FinishingSession, payload, finishingSession); } //stage 11 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FinishingSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FinishingSession.java index 18165aad7..18e878653 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FinishingSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FinishingSession.java @@ -59,7 +59,7 @@ public class FinishingSession implements ISessionStage { FinishingSessionPayload payload = (FinishingSessionPayload) task.getData(); switch (task.getTaskType()) { case FinishingSession -> { - return finishingSession(payload.getSessionId()); + return finishingSession(payload.getSessionId(), payload.getPr()); } default -> { throw new IllegalStateException("Unknown task type: " + task.getTaskType()); @@ -67,7 +67,7 @@ public class FinishingSession implements ISessionStage { } } - protected StageResult finishingSession(Long sessionId) { + protected StageResult finishingSession(Long sessionId, String pr) { // 2. Отправка сообщений Collection forRegistries = selectRegistry(sessionId); log.debug("Found {} registries for sessionId={}", forRegistries.size(), sessionId); @@ -88,7 +88,7 @@ public class FinishingSession implements ISessionStage { return sResult; } } - sdf05Sender.sendSdf05("3"); + sdf05Sender.sendSdf05(pr); StageResult> res = new StageResult<>(null, true); return res; } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FinishingSessionPayload.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FinishingSessionPayload.java index 9842cdc30..49657ef5a 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FinishingSessionPayload.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FinishingSessionPayload.java @@ -2,6 +2,7 @@ package ru.spcex.clearing.session.stage.task; public class FinishingSessionPayload { private Long sessionId; + private String pr; public Long getSessionId() { return sessionId; @@ -10,4 +11,12 @@ public class FinishingSessionPayload { public void setSessionId(Long sessionId) { this.sessionId = sessionId; } + + public String getPr() { + return pr; + } + + public void setPr(String pr) { + this.pr = pr; + } }