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

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

Browse source
This commit is contained in:
etreshenkov 2023-05-23 15:22:40 +03:00
parent 7d28912120
commit 2b2d178850
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,19 +9,23 @@ import ru.spcex.clearing.platform.messaging.domain.cud.clearing.Sdf04Request;
import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest; import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
import ru.spcex.clearing.session.stage.PrimaryAuctionBnSession;
import ru.spcex.platform.enumeration.Task; import ru.spcex.platform.enumeration.Task;
@Service @Service
public class EventsReceiver extends QueueConsumer implements InitializingBean { public class EventsReceiver extends QueueConsumer implements InitializingBean {
private final ClearingService clearingService; private final ClearingService clearingService;
private final RegistryService registryService; private final RegistryService registryService;
private final PrimaryAuctionBnSession primaryAuctionBnSession;
public EventsReceiver(Consumer<String, Object> kafkaQueue, public EventsReceiver(Consumer<String, Object> kafkaQueue,
ClearingService clearingService, ClearingService clearingService,
RegistryService registryService) { RegistryService registryService,
PrimaryAuctionBnSession primaryAuctionBnSession) {
super(kafkaQueue); super(kafkaQueue);
this.clearingService = clearingService; this.clearingService = clearingService;
this.registryService = registryService; this.registryService = registryService;
this.primaryAuctionBnSession = primaryAuctionBnSession;
} }
@Override @Override
@ -38,12 +42,15 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
callback(LauncherCommandRequest.class) callback(LauncherCommandRequest.class)
.setConsumer(event -> clearingService.executeVerification()) .setConsumer(event -> clearingService.executeVerification())
.forDestination(Task.getVerification.topic(), callbacks::put); .forDestination(Task.getVerification.topic(), callbacks::put);
callback(Object.class) //todo check Object suitable callback(Object.class)
.setConsumer(event -> clearingService.executeClearing()) .setConsumer(primaryAuctionBnSession::runSession)
.forDestination(Task.startOfClearing.topic(), callbacks::put); .forDestination(Task.startOfClearing.topic(), callbacks::put);
callback(CommonIdRequest.class) callback(CommonIdRequest.class)
.setConsumer(clearingService::continueClearing) .setConsumer(clearingService::continueClearing)
.forDestination(Consts.CONTINUE_CLEARING, callbacks::put); .forDestination(Consts.CONTINUE_CLEARING, callbacks::put);
callback(Object.class)
.setConsumer(primaryAuctionBnSession::continueSession)
.forDestination(Consts.SDF57_PROCESS, callbacks::put);
callback(Object.class) callback(Object.class)
.setConsumer(event -> clearingService.executeSTrade()) .setConsumer(event -> clearingService.executeSTrade())
.forDestination(Task.getOfTrades.topic(), callbacks::put); .forDestination(Task.getOfTrades.topic(), callbacks::put);

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

@ -10,7 +10,6 @@ import ru.clearing.classes.statics.data.execution.ExecutionCommon;
import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.misc.Session;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
import ru.spcex.clearing.session.stage.impl.*; import ru.spcex.clearing.session.stage.impl.*;
import ru.spcex.clearing.session.stage.task.*; import ru.spcex.clearing.session.stage.task.*;
@ -74,12 +73,6 @@ public class PrimaryAuctionBnSession extends QueueConsumer implements Initializi
@Override @Override
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() throws Exception {
callback(Object.class)
.setConsumer(this::continueSession)
.forDestination(Consts.SDF57_PROCESS, callbacks::put);
callback(Object.class)
.setConsumer(this::runSession)
.forDestination(ru.spcex.platform.enumeration.Task.startOfClearing.topic(), callbacks::put);
init(); init();
} }