diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf08Service.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf08Service.java index 151f93b2f..61b4baac9 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf08Service.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf08Service.java @@ -12,6 +12,7 @@ import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.balance.ExportToFileRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; +import ru.spcex.platform.enumeration.Task; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -35,10 +36,10 @@ public class Sdf08Service extends QueueConsumer implements InitializingBean { @Override public void afterPropertiesSet() { -// callback(Object.class) -// .setConsumer(this::newSDf08) -// .forDestination(Task.getAllBalance.topic(), callbacks::put); -// init(); + callback(Object.class) + .setConsumer(this::newSDf08) + .forDestination(Task.getAllBalance.topic(), callbacks::put); + init(); } private void newSDf08(BaseRequest userRequest) { diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf56Service.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf56Service.java deleted file mode 100644 index 4c87ea6a2..000000000 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf56Service.java +++ /dev/null @@ -1,61 +0,0 @@ -package ru.spcex.clearing.balance.service; - -import org.apache.kafka.clients.consumer.Consumer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.sdf.SDf56; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.platform.messaging.domain.BaseRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; -import ru.spcex.platform.enumeration.Task; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgId; -import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.time.Instant; - -@Service -public class Sdf56Service extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - private final Imdg sdf56Map; - private final ImdgId idGenerator; - private final KafkaSender kafkaReqProducer; - - - public Sdf56Service(Consumer kafkaQueue, ImdgProvider imdgProvider, KafkaSender kafkaReqProducer) { - super(kafkaQueue); - this.sdf56Map = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf56, SDf56.class); - this.idGenerator = imdgProvider.getImdgIdGenerator(); - this.kafkaReqProducer = kafkaReqProducer; - } - - @Override - public void afterPropertiesSet() { - callback(Object.class) - .setConsumer(this::newSDf56) - .forDestination(Task.getAllBalance.topic(), callbacks::put); - init(); - } - - private void newSDf56(BaseRequest userRequest) { - log.debug("GALB request received; creating sdf56"); - SDf56 sDf56 = new SDf56(); - sDf56.setNumber(idGenerator.nextId().toString()); - Instant now = Instant.now(); - sDf56.setStart_datetime(String.valueOf(now.toEpochMilli())); - sDf56.setEnd_datetime(String.valueOf(now.toEpochMilli())); - sDf56.setAccount("ТБС"); - sDf56.setDeal("КОДУ"); - sDf56.setGenerationTime(now); - sDf56.setGenerationId(idGenerator.nextId()); - sdf56Map.insert(sDf56); -// ExportToFileRequest exportRequest = new ExportToFileRequest(); -// exportRequest.setSdfGroupId(s.getGenerationId()); -// exportRequest.setNameOfTable("DF-08"); -// kafkaReqProducer.sendRequestToQueue(Consts.EXPORT_PROCESS, exportRequest); - log.debug("successfully processed, new id {}", sDf56.getId()); - } -}