From 2b4c5fef77f94e1c96afd9cae078e664155d7e47 Mon Sep 17 00:00:00 2001 From: etreshenkov Date: Tue, 13 Jun 2023 17:09:40 +0300 Subject: [PATCH] fix bug --- .../lim/exporter/services/AbstractExporterService.java | 4 +++- .../lim/exporter/services/LauncherCommandReceiver.java | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java index 58c85a67a..093c477ba 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java @@ -9,6 +9,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.lim.exporter.config.SFTPConfig; import ru.spcex.clearing.platform.messaging.domain.cud.utilities.LimExportedRequest; import ru.spcex.clearing.platform.messaging.serialization.LogFormatter; +import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; import ru.spcex.platform.enumeration.Section; import ru.spcex.platform.enumeration.ServiceStatus; @@ -53,7 +54,7 @@ public abstract class AbstractExporterService { public abstract Section section(); - public void process() { + public RequestInfoUpdate process() { String fileName = getTargetFileName(); log.debug("Start export {} Lim file", fileName); @@ -77,6 +78,7 @@ public abstract class AbstractExporterService { log.debug("Successfully exported {} file", fileName); sendLimExportedNotification(fileName); + return null; } void sendLimExportedNotification(String fileName) { diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/LauncherCommandReceiver.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/LauncherCommandReceiver.java index 660a4c287..9dea4ab50 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/LauncherCommandReceiver.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/LauncherCommandReceiver.java @@ -1,6 +1,7 @@ package ru.spcex.clearing.lim.exporter.services; import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -16,9 +17,10 @@ public class LauncherCommandReceiver extends QueueConsumer implements Initializi private final SecurityExporterService securityExporterService; public LauncherCommandReceiver(Consumer kafkaQueue, + Producer kafkaProducer, MoneyExporterService moneyExporterService, SecurityExporterService securityExporterService) { - super(kafkaQueue); + super(kafkaQueue, kafkaProducer); this.moneyExporterService = moneyExporterService; this.securityExporterService = securityExporterService; } @@ -26,10 +28,10 @@ public class LauncherCommandReceiver extends QueueConsumer implements Initializi @Override public void afterPropertiesSet() { callback(LauncherCommandRequest.class) - .setConsumer(action -> moneyExporterService.process()) + .setFunction(action -> moneyExporterService.process()) .forDestination(Task.unloadingSession_LIMM.topic(), callbacks::put); // LIMM callback(LauncherCommandRequest.class) - .setConsumer(action -> securityExporterService.process()) + .setFunction(action -> securityExporterService.process()) .forDestination(Task.unloadingSession_LIMS.topic(), callbacks::put); // LIMS init(); }