From 3014515e0081bcf89d020af7d58b120952b31f1b Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 30 Sep 2022 13:42:39 +0300 Subject: [PATCH] balance-service put sdf02 request to kafka --- .../ru/spcex/clearing/account/service/AccountService.java | 5 +++-- .../ru/spcex/clearing/balance/service/StatementService.java | 5 +++++ .../src/main/resources/application.properties | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java index 5a55e3809..57bea0fa9 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java @@ -55,7 +55,7 @@ public class AccountService extends QueueConsumer implements InitializingBean { AccountSdf01ToStatementRequestPart responsePart = responsePart(accountReq.getSdf01Id()); accountToStatement.add(responsePart); } - sendStatementRequestBack(accountToStatement); + sendStatementRequestBack(req.getGroupingSdf01Id(), accountToStatement); log.debug("successfully processed, grouping id={}, processed number={}", req.getGroupingSdf01Id(), accountToStatement.size()); } @@ -67,8 +67,9 @@ public class AccountService extends QueueConsumer implements InitializingBean { return responsePart; } - private void sendStatementRequestBack(List results) { + private void sendStatementRequestBack(Long groupingSdf01Id, List results) { StatementRequest request = new StatementRequest(); + request.setSdf01GroupId(groupingSdf01Id); request.setAccountCreationResults(results); kafkaSender.sendRequestToQueue(Consts.STATEMENT_PROCESS, request); } diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java index 69307b408..b4aeae21a 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java @@ -19,6 +19,7 @@ import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdf01Request; import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdf01RequestPart; +import ru.spcex.clearing.platform.messaging.domain.cud.balance.ExportToFileRequest; import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; @@ -133,6 +134,10 @@ public class StatementService extends QueueConsumer implements InitializingBean if (accountRequests.size() > 0) { kafkaReqProducer.sendRequestToQueue(Consts.ACCOUNT_NEW, createAccountsRequest(sdf01.getGenerationId(), accountRequests)); + } else { + ExportToFileRequest exportRequest = new ExportToFileRequest(); + exportRequest.setSdfGroupId(statementRequest.getSdf01GroupId()); + exportRequest.setNameOfTable("DF-02"); } } } diff --git a/clearing-parent/balance-service/src/main/resources/application.properties b/clearing-parent/balance-service/src/main/resources/application.properties index d7ca974d0..b865b73a3 100644 --- a/clearing-parent/balance-service/src/main/resources/application.properties +++ b/clearing-parent/balance-service/src/main/resources/application.properties @@ -4,7 +4,7 @@ balance-service.hazelcast.login=dev balance-service.hazelcast.password=dev-pass balance-service.kafka-consumer.bootstrap-servers=localhost:9092 -balance-service.kafka-consumer.group-id=dev-group +balance-service.kafka-consumer.group-id=dev-group-balance-service balance-service.kafka-consumer.enable-auto-commit=false balance-service.kafka-consumer.session-timeout-ms=30000 balance-service.kafka-consumer.auto-offset-reset=latest