From eeb742153fc6cf016fb3f348e11410aba330e48c Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 10 Jul 2026 18:35:07 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-1065 --- .../config/MarketCodesBySessionConfig.java | 16 ++++++++-------- ...rimaryAuctionB0SessionStateMachineConfig.java | 2 +- ...nBnIntermediateSessionStateMachineConfig.java | 2 +- ...rimaryAuctionBnSessionStateMachineConfig.java | 2 +- ...rimaryAuctionT0SessionStateMachineConfig.java | 2 +- .../clearing/session/stage/FinalMkrSession.java | 2 +- .../session/stage/IntermediateMkrSession.java | 2 +- .../session/stage/PrimaryAuctionB0Session.java | 2 +- .../session/stage/PrimaryAuctionBnSession.java | 2 +- .../session/stage/PrimaryAuctionT0Session.java | 2 +- .../spcex/platform/enumeration/MarketType.java | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/MarketCodesBySessionConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/MarketCodesBySessionConfig.java index 4c54d0768..d43c0f5e7 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/MarketCodesBySessionConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/MarketCodesBySessionConfig.java @@ -19,9 +19,14 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; @Configuration public class MarketCodesBySessionConfig { - @Bean(name = "marketCodesForBn") - public Supplier> marketCodesForBn(ImdgProvider imdgProvider) { - return new MarketCodesProvider(imdgProvider, Section.FOND, MarketType.PRMR); + @Bean(name = "marketCodesFondPrmrOrPrmo") + public Supplier> marketCodesFondPrmrOrPrmo(ImdgProvider imdgProvider) { + return new MarketCodesProviderV2(imdgProvider, Section.FOND, MarketType.PRMR, MarketType.PRMO); + } + + @Bean(name = "marketCodesFondPrmo") + public Supplier> marketCodesFondPrmo(ImdgProvider imdgProvider) { + return new MarketCodesProviderV2(imdgProvider, Section.FOND, MarketType.PRMO); } @Bean(name = "marketCodesForT0") @@ -39,11 +44,6 @@ public class MarketCodesBySessionConfig { return new MarketCodesProviderV2(imdgProvider, Section.CURR, MarketType.SCND, MarketType.SCSP); } - @Bean(name = "marketCodesForT0Primary") - public Supplier> marketCodesForT0Primary(ImdgProvider imdgProvider) { - return new MarketCodesProvider(imdgProvider, Section.FOND, MarketType.PRMR); - } - private static class MarketCodesProvider implements Supplier> { private volatile List codes; private final Object lock = new Object(); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java index 4779233b6..64cdfdee0 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java @@ -102,7 +102,7 @@ public class PrimaryAuctionB0SessionStateMachineConfig AgainReviseStage3Action againRevise, FinishingSessionAction finishingSessionAction, SaveRegistriesAndContinueAction obligationAdmissionContinueAction, - @Qualifier("marketCodesForBn") Supplier> marketCodes, + @Qualifier("marketCodesFondPrmrOrPrmo") Supplier> marketCodes, SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction, @Qualifier("pauseWorkflowStatusAction") UpdateWorkflowStatusAction pauseWsAction, diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnIntermediateSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnIntermediateSessionStateMachineConfig.java index 276e4f92b..05e97e59f 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnIntermediateSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnIntermediateSessionStateMachineConfig.java @@ -102,7 +102,7 @@ public class PrimaryAuctionBnIntermediateSessionStateMachineConfig FormingPaymentInstructionSecuritiesAction formingPaymentInstructionSecuritiesAction, FinishingSessionAction finishingSessionAction, SaveRegistriesAndContinueAction obligationAdmissionContinueAction, - @Qualifier("marketCodesForBn") + @Qualifier("marketCodesFondPrmo") Supplier> marketCodes, SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction, @Qualifier("pauseWorkflowStatusAction") diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java index 0e255b568..730c344b2 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java @@ -102,7 +102,7 @@ public class PrimaryAuctionBnSessionStateMachineConfig FormingPaymentInstructionSecuritiesAction formingPaymentInstructionSecuritiesAction, FinishingSessionAction finishingSessionAction, SaveRegistriesAndContinueAction obligationAdmissionContinueAction, - @Qualifier("marketCodesForBn") + @Qualifier("marketCodesFondPrmrOrPrmo") Supplier> marketCodes, SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction, @Qualifier("pauseWorkflowStatusAction") diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java index e3a5f99a4..eb6f9b06b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java @@ -102,7 +102,7 @@ public class PrimaryAuctionT0SessionStateMachineConfig AgainReviseStage3Action againRevise, FinishingSessionAction finishingSessionAction, SaveRegistriesAndContinueAction obligationAdmissionContinueAction, - @Qualifier("marketCodesForT0Primary") + @Qualifier("marketCodesFondPrmrOrPrmo") Supplier> marketCodes, SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction, @Qualifier("pauseWorkflowStatusAction") 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 5d9b341d8..ff0a38d2e 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 @@ -91,7 +91,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean EndStageNotification endStageNotification, IMessageResolver messageResolver, InspectionObligationsDepositReturn inspectionObligationsReturn, - @Qualifier("marketCodesForBn") Supplier> marketCodes) { + @Qualifier("marketCodesFondPrmrOrPrmo") Supplier> marketCodes) { super(imdgProvider, messageResolver); this.balanceRevise = balanceRevise; this.dealsPrepare = dealsPrepare; 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 dd68d0c0d..ee0f6f308 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 @@ -86,7 +86,7 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ FinishingSession finishingSession, EndStageNotification endStageNotification, IMessageResolver messageResolver, - @Qualifier("marketCodesForBn") Supplier> marketCodes) { + @Qualifier("marketCodesFondPrmrOrPrmo") Supplier> marketCodes) { super(imdgProvider, messageResolver); this.balanceRevise = balanceRevise; this.dealsPrepare = dealsPrepare; 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 e7915c227..934fefeea 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 @@ -87,7 +87,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali EndStageNotification endStageNotification, IMessageResolver messageResolver, InspectionObligationsV2 inspectionObligations, - @Qualifier("marketCodesForBn") Supplier> marketCodes) { + @Qualifier("marketCodesFondPrmrOrPrmo") Supplier> marketCodes) { super(imdgProvider, messageResolver); this.balanceRevise = balanceRevise; this.dealsPrepare = dealsPrepare; 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 074014ad5..d8aed7d37 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 @@ -87,7 +87,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali EndStageNotification endStageNotification, IMessageResolver messageResolver, InspectionObligationsV2 inspectionObligations, - @Qualifier("marketCodesForBn") Supplier> marketCodes) { + @Qualifier("marketCodesFondPrmrOrPrmo") Supplier> marketCodes) { super(imdgProvider, messageResolver); this.balanceRevise = balanceRevise; this.dealsPrepare = dealsPrepare; 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 136b442f7..b1a1b152f 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 @@ -87,7 +87,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali EndStageNotification endStageNotification, IMessageResolver messageResolver, InspectionObligationsV2 inspectionObligations, - @Qualifier("marketCodesForT0Primary") Supplier> marketCodes) { + @Qualifier("marketCodesFondPrmrOrPrmo") Supplier> marketCodes) { super(imdgProvider, messageResolver); this.balanceRevise = balanceRevise; this.dealsPrepare = dealsPrepare; diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/MarketType.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/MarketType.java index 1c8786c62..427cd1a58 100644 --- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/MarketType.java +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/MarketType.java @@ -3,7 +3,7 @@ package ru.spcex.platform.enumeration; import ru.spcex.platform.utils.enumeration.IEnumKey; public enum MarketType implements IEnumKey { - PRMR("PRMR"), SCND("SCND"), SCSW("SCSW"), SCSP("SCSP"); + PRMR("PRMR"), SCND("SCND"), SCSW("SCSW"), SCSP("SCSP"), PRMO("PRMO"); private final String key;