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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2025-07-04 15:55:42 +03:00
commit b264a91769
2 changed files with 12 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java
View file

@ -39,19 +39,8 @@ import ru.spcex.clearing.service.execution.ExecutionFondComponent;
import ru.spcex.clearing.service.executors.Sdf06Executor; import ru.spcex.clearing.service.executors.Sdf06Executor;
import ru.spcex.clearing.service.executors.Sdf10Executor; import ru.spcex.clearing.service.executors.Sdf10Executor;
import ru.spcex.clearing.service.payment.PaymentInstructionOutboundService; import ru.spcex.clearing.service.payment.PaymentInstructionOutboundService;
import ru.spcex.clearing.session.stage.CurrencySession;
import ru.spcex.clearing.session.stage.FinalMkrSession;
import ru.spcex.clearing.session.stage.IntermediateMkrSession;
import ru.spcex.clearing.session.stage.PaymSession;
import ru.spcex.clearing.session.stage.PrimaryAuctionB0Session;
import ru.spcex.clearing.session.stage.PrimaryAuctionBnSession;
import ru.spcex.clearing.session.stage.PrimaryAuctionT0Session;
import ru.spcex.clearing.session.stage.ReturnDepositSession;
import ru.spcex.clearing.session.stage.SecondaryAuctionT0Session;
import ru.spcex.clearing.session.stage.SessionManager;
import ru.spcex.clearing.session.stage.SessionTerminator; import ru.spcex.clearing.session.stage.SessionTerminator;
import ru.spcex.clearing.session.stage.TaskType; import ru.spcex.clearing.session.stage.TaskType;
import ru.spcex.clearing.session.stage.UnitedSession;
import ru.spcex.clearing.session.stage.impl.BalanceRevise; import ru.spcex.clearing.session.stage.impl.BalanceRevise;
import ru.spcex.clearing.session.state.SsnEvent; import ru.spcex.clearing.session.state.SsnEvent;
import ru.spcex.clearing.session.state.factory.SessionStateMachineWrapper; import ru.spcex.clearing.session.state.factory.SessionStateMachineWrapper;
@ -67,17 +56,6 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean
private final IMessageResolver errorResolver; private final IMessageResolver errorResolver;
private final ClearingService clearingService; private final ClearingService clearingService;
private final RegistryService registryService; private final RegistryService registryService;
private final PrimaryAuctionBnSession primaryAuctionBnSession;
private final PrimaryAuctionT0Session primaryAuctionT0Session;
private final SecondaryAuctionT0Session secondaryAuctionT0Session;
private final CurrencySession currencySession;
private final PrimaryAuctionB0Session primaryAuctionB0Session;
private final IntermediateMkrSession intermediateMkrSession;
private final FinalMkrSession finalMkrSession;
private final PaymSession paymSession;
private final UnitedSession unitedSession;
private final ReturnDepositSession returnDepositSession;
private final SessionManager sessionManager;
private final SessionStateMachineWrapper stateMachineWrapper; private final SessionStateMachineWrapper stateMachineWrapper;
private final Sdf06Executor sdf06Executor; private final Sdf06Executor sdf06Executor;
private final Sdf10Executor sdf10Executor; private final Sdf10Executor sdf10Executor;
@ -95,28 +73,22 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean
Environment environment, IMessageResolver errorResolver, Environment environment, IMessageResolver errorResolver,
ClearingService clearingService, ClearingService clearingService,
RegistryService registryService, RegistryService registryService,
PrimaryAuctionBnSession primaryAuctionBnSession, SessionStateMachineWrapper stateMachineWrapper,
SecondaryAuctionT0Session secondaryAuctionT0Session,
CurrencySession currencySession,
PrimaryAuctionB0Session primaryAuctionB0Session, PrimaryAuctionT0Session primaryAuctionT0Session, IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, UnitedSession unitedSession, ReturnDepositSession returnDepositSession, PaymSession paymSession, SessionManager sessionManager, SessionStateMachineWrapper stateMachineWrapper,
Sdf06Executor sdf06Executor, Sdf06Executor sdf06Executor,
Sdf10Executor sdf10Executor, BalanceRevise balanceRevise, Sdf05Sender sdf05Sender, StatementServiceV2 statementService, SessionTerminator sessionTerminator, PaymentInstructionOutboundService pmtOutboundService, ExecutionCurrencyComponent execCurrUpload, ExecutionDepositComponent execDepUpload, ExecutionFondComponent execFondUpload) { Sdf10Executor sdf10Executor,
BalanceRevise balanceRevise,
Sdf05Sender sdf05Sender,
StatementServiceV2 statementService,
SessionTerminator sessionTerminator,
PaymentInstructionOutboundService pmtOutboundService,
ExecutionCurrencyComponent execCurrUpload,
ExecutionDepositComponent execDepUpload,
ExecutionFondComponent execFondUpload) {
super(kafkaQueue, kafkaResponseQueue); super(kafkaQueue, kafkaResponseQueue);
this.environment = environment; this.environment = environment;
this.errorResolver = errorResolver; this.errorResolver = errorResolver;
this.clearingService = clearingService; this.clearingService = clearingService;
this.registryService = registryService; this.registryService = registryService;
this.primaryAuctionBnSession = primaryAuctionBnSession;
this.secondaryAuctionT0Session = secondaryAuctionT0Session;
this.currencySession = currencySession;
this.primaryAuctionB0Session = primaryAuctionB0Session;
this.primaryAuctionT0Session = primaryAuctionT0Session;
this.intermediateMkrSession = intermediateMkrSession;
this.finalMkrSession = finalMkrSession;
this.paymSession = paymSession;
this.unitedSession = unitedSession;
this.returnDepositSession = returnDepositSession;
this.sessionManager = sessionManager;
this.stateMachineWrapper = stateMachineWrapper; this.stateMachineWrapper = stateMachineWrapper;
this.sdf06Executor = sdf06Executor; this.sdf06Executor = sdf06Executor;
this.sdf10Executor = sdf10Executor; this.sdf10Executor = sdf10Executor;
@ -153,12 +125,7 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean
callback(LauncherCommandRequest.class) callback(LauncherCommandRequest.class)
.setFunction(r -> { .setFunction(r -> {
try { stateMachineWrapper.defineAndStartSession(r);
sessionManager.defineAndStartSession(r);
stateMachineWrapper.defineAndStartSession(r);
} catch (ValidationException ve) {
return makeErrorResponse(r, ve);
}
return null; return null;
}) })
.forDestination(Task.startOfClearing.topic(), callbacks::put); .forDestination(Task.startOfClearing.topic(), callbacks::put);
@ -174,16 +141,6 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean
.forDestination(Consts.STATEMENT_PROCESS, callbacks::put); .forDestination(Consts.STATEMENT_PROCESS, callbacks::put);
callback(SessionContinueEvent.class) callback(SessionContinueEvent.class)
.setConsumer(req -> { .setConsumer(req -> {
primaryAuctionBnSession.continueSession(req);
primaryAuctionT0Session.continueSession(req);
secondaryAuctionT0Session.continueSession(req);
currencySession.continueSession(req);
primaryAuctionB0Session.continueSession(req);
intermediateMkrSession.continueSession(req);
//finalMkrSession.continueSession(req);
unitedSession.continueSession(req);
returnDepositSession.continueSession(req);
paymSession.continueSession(req);
SessionContinueEvent payload = req.getRequestPayload(); SessionContinueEvent payload = req.getRequestPayload();
Stream Stream
.ofNullable(payload.getSdfType()) .ofNullable(payload.getSdfType())

6
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/factory/SessionStateMachineWrapper.java
View file

@ -100,11 +100,7 @@ public class SessionStateMachineWrapper {
} }
private StateMachineFactory<TaskType, SsnEvent> getByType(SessionType sessionType) { private StateMachineFactory<TaskType, SsnEvent> getByType(SessionType sessionType) {
StateMachineFactory<TaskType, SsnEvent> factory = factories.get(sessionType); return factories.get(sessionType);
//if (factory == null) {
// throw new NoSuchElementException("no state machine for session: " + sessionType);
//}
return factory;
} }