treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-1065

Browse source
This commit is contained in:
ialbert 2026-07-10 18:35:07 +03:00
parent c1476d2cd3
commit eeb742153f
11 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/MarketCodesBySessionConfig.java
View file

@ -19,9 +19,14 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
@Configuration @Configuration
public class MarketCodesBySessionConfig { public class MarketCodesBySessionConfig {
@Bean(name = "marketCodesForBn") @Bean(name = "marketCodesFondPrmrOrPrmo")
public Supplier<List<String>> marketCodesForBn(ImdgProvider imdgProvider) { public Supplier<List<String>> marketCodesFondPrmrOrPrmo(ImdgProvider imdgProvider) {
return new MarketCodesProvider(imdgProvider, Section.FOND, MarketType.PRMR); return new MarketCodesProviderV2(imdgProvider, Section.FOND, MarketType.PRMR, MarketType.PRMO);
}
@Bean(name = "marketCodesFondPrmo")
public Supplier<List<String>> marketCodesFondPrmo(ImdgProvider imdgProvider) {
return new MarketCodesProviderV2(imdgProvider, Section.FOND, MarketType.PRMO);
} }
@Bean(name = "marketCodesForT0") @Bean(name = "marketCodesForT0")
@ -39,11 +44,6 @@ public class MarketCodesBySessionConfig {
return new MarketCodesProviderV2(imdgProvider, Section.CURR, MarketType.SCND, MarketType.SCSP); return new MarketCodesProviderV2(imdgProvider, Section.CURR, MarketType.SCND, MarketType.SCSP);
} }
@Bean(name = "marketCodesForT0Primary")
public Supplier<List<String>> marketCodesForT0Primary(ImdgProvider imdgProvider) {
return new MarketCodesProvider(imdgProvider, Section.FOND, MarketType.PRMR);
}
private static class MarketCodesProvider implements Supplier<List<String>> { private static class MarketCodesProvider implements Supplier<List<String>> {
private volatile List<String> codes; private volatile List<String> codes;
private final Object lock = new Object(); private final Object lock = new Object();

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java
View file

@ -102,7 +102,7 @@ public class PrimaryAuctionB0SessionStateMachineConfig
AgainReviseStage3Action againRevise, AgainReviseStage3Action againRevise,
FinishingSessionAction finishingSessionAction, FinishingSessionAction finishingSessionAction,
SaveRegistriesAndContinueAction obligationAdmissionContinueAction, SaveRegistriesAndContinueAction obligationAdmissionContinueAction,
@Qualifier("marketCodesForBn") Supplier<List<String>> marketCodes, @Qualifier("marketCodesFondPrmrOrPrmo") Supplier<List<String>> marketCodes,
SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction, SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction,
@Qualifier("pauseWorkflowStatusAction") @Qualifier("pauseWorkflowStatusAction")
UpdateWorkflowStatusAction pauseWsAction, UpdateWorkflowStatusAction pauseWsAction,

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnIntermediateSessionStateMachineConfig.java
View file

@ -102,7 +102,7 @@ public class PrimaryAuctionBnIntermediateSessionStateMachineConfig
FormingPaymentInstructionSecuritiesAction formingPaymentInstructionSecuritiesAction, FormingPaymentInstructionSecuritiesAction formingPaymentInstructionSecuritiesAction,
FinishingSessionAction finishingSessionAction, FinishingSessionAction finishingSessionAction,
SaveRegistriesAndContinueAction obligationAdmissionContinueAction, SaveRegistriesAndContinueAction obligationAdmissionContinueAction,
@Qualifier("marketCodesForBn") @Qualifier("marketCodesFondPrmo")
Supplier<List<String>> marketCodes, Supplier<List<String>> marketCodes,
SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction, SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction,
@Qualifier("pauseWorkflowStatusAction") @Qualifier("pauseWorkflowStatusAction")

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java
View file

@ -102,7 +102,7 @@ public class PrimaryAuctionBnSessionStateMachineConfig
FormingPaymentInstructionSecuritiesAction formingPaymentInstructionSecuritiesAction, FormingPaymentInstructionSecuritiesAction formingPaymentInstructionSecuritiesAction,
FinishingSessionAction finishingSessionAction, FinishingSessionAction finishingSessionAction,
SaveRegistriesAndContinueAction obligationAdmissionContinueAction, SaveRegistriesAndContinueAction obligationAdmissionContinueAction,
@Qualifier("marketCodesForBn") @Qualifier("marketCodesFondPrmrOrPrmo")
Supplier<List<String>> marketCodes, Supplier<List<String>> marketCodes,
SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction, SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction,
@Qualifier("pauseWorkflowStatusAction") @Qualifier("pauseWorkflowStatusAction")

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java
View file

@ -102,7 +102,7 @@ public class PrimaryAuctionT0SessionStateMachineConfig
AgainReviseStage3Action againRevise, AgainReviseStage3Action againRevise,
FinishingSessionAction finishingSessionAction, FinishingSessionAction finishingSessionAction,
SaveRegistriesAndContinueAction obligationAdmissionContinueAction, SaveRegistriesAndContinueAction obligationAdmissionContinueAction,
@Qualifier("marketCodesForT0Primary") @Qualifier("marketCodesFondPrmrOrPrmo")
Supplier<List<String>> marketCodes, Supplier<List<String>> marketCodes,
SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction, SaveRegistriesAfterInspectionAndContinueAction saveRegistriesAfterInspectionAndContinueAction,
@Qualifier("pauseWorkflowStatusAction") @Qualifier("pauseWorkflowStatusAction")

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java
View file

@ -91,7 +91,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean
EndStageNotification endStageNotification, EndStageNotification endStageNotification,
IMessageResolver messageResolver, IMessageResolver messageResolver,
InspectionObligationsDepositReturn inspectionObligationsReturn, InspectionObligationsDepositReturn inspectionObligationsReturn,
@Qualifier("marketCodesForBn") Supplier<List<String>> marketCodes) { @Qualifier("marketCodesFondPrmrOrPrmo") Supplier<List<String>> marketCodes) {
super(imdgProvider, messageResolver); super(imdgProvider, messageResolver);
this.balanceRevise = balanceRevise; this.balanceRevise = balanceRevise;
this.dealsPrepare = dealsPrepare; this.dealsPrepare = dealsPrepare;

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java
View file

@ -86,7 +86,7 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ
FinishingSession finishingSession, FinishingSession finishingSession,
EndStageNotification endStageNotification, EndStageNotification endStageNotification,
IMessageResolver messageResolver, IMessageResolver messageResolver,
@Qualifier("marketCodesForBn") Supplier<List<String>> marketCodes) { @Qualifier("marketCodesFondPrmrOrPrmo") Supplier<List<String>> marketCodes) {
super(imdgProvider, messageResolver); super(imdgProvider, messageResolver);
this.balanceRevise = balanceRevise; this.balanceRevise = balanceRevise;
this.dealsPrepare = dealsPrepare; this.dealsPrepare = dealsPrepare;

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java
View file

@ -87,7 +87,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali
EndStageNotification endStageNotification, EndStageNotification endStageNotification,
IMessageResolver messageResolver, IMessageResolver messageResolver,
InspectionObligationsV2 inspectionObligations, InspectionObligationsV2 inspectionObligations,
@Qualifier("marketCodesForBn") Supplier<List<String>> marketCodes) { @Qualifier("marketCodesFondPrmrOrPrmo") Supplier<List<String>> marketCodes) {
super(imdgProvider, messageResolver); super(imdgProvider, messageResolver);
this.balanceRevise = balanceRevise; this.balanceRevise = balanceRevise;
this.dealsPrepare = dealsPrepare; this.dealsPrepare = dealsPrepare;

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java
View file

@ -87,7 +87,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali
EndStageNotification endStageNotification, EndStageNotification endStageNotification,
IMessageResolver messageResolver, IMessageResolver messageResolver,
InspectionObligationsV2 inspectionObligations, InspectionObligationsV2 inspectionObligations,
@Qualifier("marketCodesForBn") Supplier<List<String>> marketCodes) { @Qualifier("marketCodesFondPrmrOrPrmo") Supplier<List<String>> marketCodes) {
super(imdgProvider, messageResolver); super(imdgProvider, messageResolver);
this.balanceRevise = balanceRevise; this.balanceRevise = balanceRevise;
this.dealsPrepare = dealsPrepare; this.dealsPrepare = dealsPrepare;

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java
View file

@ -87,7 +87,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali
EndStageNotification endStageNotification, EndStageNotification endStageNotification,
IMessageResolver messageResolver, IMessageResolver messageResolver,
InspectionObligationsV2 inspectionObligations, InspectionObligationsV2 inspectionObligations,
@Qualifier("marketCodesForT0Primary") Supplier<List<String>> marketCodes) { @Qualifier("marketCodesFondPrmrOrPrmo") Supplier<List<String>> marketCodes) {
super(imdgProvider, messageResolver); super(imdgProvider, messageResolver);
this.balanceRevise = balanceRevise; this.balanceRevise = balanceRevise;
this.dealsPrepare = dealsPrepare; this.dealsPrepare = dealsPrepare;

2
platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/MarketType.java
View file

@ -3,7 +3,7 @@ package ru.spcex.platform.enumeration;
import ru.spcex.platform.utils.enumeration.IEnumKey; import ru.spcex.platform.utils.enumeration.IEnumKey;
public enum MarketType implements 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; private final String key;