From e9a1b245f150d8af5f420667eb727d474f1f8f10 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 1 Jun 2023 16:39:31 +0300 Subject: [PATCH] ReturnDepositSession XDEP --- .../main/java/ru/spcex/clearing/service/EventsReceiver.java | 5 ++++- .../java/ru/spcex/clearing/session/stage/SessionManager.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java index 44a66d543..dcf7b58e7 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java @@ -29,6 +29,7 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean { private final PrimaryAuctionB0Session primaryAuctionB0Session; private final IntermediateMkrSession intermediateMkrSession; private final FinalMkrSession finalMkrSession; + private final ReturnDepositSession returnDepositSession; private final SessionManager sessionManager; @Autowired @@ -37,7 +38,7 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean { RegistryService registryService, PrimaryAuctionBnSession primaryAuctionBnSession, SecondaryAuctionT0Session secondaryAuctionT0Session, - PrimaryAuctionB0Session primaryAuctionB0Session, PrimaryAuctionT0Session primaryAuctionT0Session, IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, SessionManager sessionManager) { + PrimaryAuctionB0Session primaryAuctionB0Session, PrimaryAuctionT0Session primaryAuctionT0Session, IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, ReturnDepositSession returnDepositSession, SessionManager sessionManager) { super(kafkaQueue); this.clearingService = clearingService; this.registryService = registryService; @@ -47,6 +48,7 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean { this.primaryAuctionT0Session = primaryAuctionT0Session; this.intermediateMkrSession = intermediateMkrSession; this.finalMkrSession = finalMkrSession; + this.returnDepositSession = returnDepositSession; this.sessionManager = sessionManager; } @@ -80,6 +82,7 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean { primaryAuctionB0Session.continueSession(req); intermediateMkrSession.continueSession(req); finalMkrSession.continueSession(req); + returnDepositSession.continueSession(req); }) .forDestination(Consts.CONTINUE_SESSION_BN_FIRST_PART, callbacks::put); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionManager.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionManager.java index 9633ac4bb..0ce0748e7 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionManager.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionManager.java @@ -18,18 +18,20 @@ public class SessionManager { private final SecondaryAuctionT0Session secondaryAuctionT0Session; private final IntermediateMkrSession intermediateMkrSession; private final FinalMkrSession finalMkrSession; + private final ReturnDepositSession returnDepositSession; public SessionManager(PrimaryAuctionT0Session primaryAuctionT0Session, PrimaryAuctionBnSession primaryAuctionBnSession, PrimaryAuctionB0Session primaryAuctionB0Session, SecondaryAuctionT0Session secondaryAuctionT0Session, - IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession) { + IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, ReturnDepositSession returnDepositSession) { this.primaryAuctionT0Session = primaryAuctionT0Session; this.primaryAuctionBnSession = primaryAuctionBnSession; this.primaryAuctionB0Session = primaryAuctionB0Session; this.secondaryAuctionT0Session = secondaryAuctionT0Session; this.intermediateMkrSession = intermediateMkrSession; this.finalMkrSession = finalMkrSession; + this.returnDepositSession = returnDepositSession; } public void defineAndStartSession(BaseRequest r) { //task sclr section fond sessiontype trdt @@ -50,6 +52,7 @@ public class SessionManager { case TRDT -> session = secondaryAuctionT0Session; case MEDM -> session = intermediateMkrSession; case FINL -> session = finalMkrSession; + case XDEP -> session = returnDepositSession; } if (session != null) {