From 86e9b724ac3832d090dca51471e93646893e18c3 Mon Sep 17 00:00:00 2001 From: aalehin Date: Tue, 29 Nov 2022 16:36:12 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-51 --- SchedulerAllTodayService fix up --- .../service/SchedulerAllTodayService.java | 55 +------------------ 1 file changed, 3 insertions(+), 52 deletions(-) diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerAllTodayService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerAllTodayService.java index faff5d228..959c40453 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerAllTodayService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerAllTodayService.java @@ -7,13 +7,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.scheduler.Scheduler; +import ru.clearing.classes.statics.data.scheduler.SchedulerAllToday; import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.platform.messaging.domain.BaseRequest; -import ru.spcex.clearing.platform.messaging.domain.Consts; -import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest; -import ru.spcex.clearing.platform.messaging.domain.cud.schedule.SchedulerNewRequest; -import ru.spcex.clearing.platform.messaging.domain.cud.schedule.SchedulerUpdateRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -21,62 +16,18 @@ import ru.spcex.platform.imdg.api.ImdgProvider; @Service public class SchedulerAllTodayService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); - private final Imdg schedulerMap; + private final Imdg schedulerAllTodayMap; @Autowired public SchedulerAllTodayService(Consumer kafkaQueue, Producer kafkaProducer, ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); - this.schedulerMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Scheduler, Scheduler.class); + this.schedulerAllTodayMap = imdgProvider.getImdg(IMDGDistributedNames.Map_SchedulerAllToday, SchedulerAllToday.class); } @Override public void afterPropertiesSet() { - callback(SchedulerNewRequest.class) - .setConsumer(this::newScheduler) - .forDestination(Consts.DESTINATION_SCHEDULER_NEW, callbacks::put); - callback(SchedulerUpdateRequest.class) - .setConsumer(this::updateScheduler) - .forDestination(Consts.DESTINATION_SCHEDULER_UPDATE, callbacks::put); - callback(CommonDeleteRequest.class) - .setConsumer(this::deleteScheduler) - .forDestination(Consts.DESTINATION_SCHEDULER_DELETE, callbacks::put); init(); } - private void newScheduler(BaseRequest userRequest) { - SchedulerNewRequest req = userRequest.getRequestPayload(); - log.debug("SchedulerNewRequest received"); - Scheduler scheduler = new Scheduler(); - scheduler.setTask(req.getTask()); - scheduler.setTaskTime(req.getTaskTime()); - scheduler.setClearingDate(req.getClearingDate()); - scheduler.setMarket(req.getMarket()); - scheduler.setTaskStatus(req.getTaskStatus()); - scheduler.setSecurityId(req.getSecurityId()); - schedulerMap.insert(scheduler); - log.debug("successfully processed, new id {}", scheduler.getId()); - } - - private void updateScheduler(BaseRequest userRequest) { - SchedulerUpdateRequest req = userRequest.getRequestPayload(); - log.debug("SchedulerUpdateRequest received id = {}", req.getId()); - Scheduler scheduler = schedulerMap.getSingleObjectByID(req.getId()); - scheduler.setTask(req.getTask()); - scheduler.setTaskTime(req.getTaskTime()); - scheduler.setClearingDate(req.getClearingDate()); - scheduler.setMarket(req.getMarket()); - scheduler.setTaskStatus(req.getTaskStatus()); - scheduler.setSecurityId(req.getSecurityId()); - - schedulerMap.update(scheduler); - } - - private void deleteScheduler(BaseRequest userRequest) { - CommonDeleteRequest req = userRequest.getRequestPayload(); - log.debug("CommonDeleteRequest received id = {}", req.getId()); - Scheduler scheduler = schedulerMap.getSingleObjectByID(req.getId()); - schedulerMap.delete(scheduler); - } - }