From 41cdca1e3b2a38bbaa3a1ef019c057c7500809e6 Mon Sep 17 00:00:00 2001 From: etreshenkov Date: Tue, 23 May 2023 18:05:31 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-314 sdf57 and sdf51 --- .../exporter/logic/data/ResultContainer.java | 10 +++---- .../logic/data/enums/FilenameTemplate.java | 6 ++--- .../dbf/exporter/services/CommandService.java | 26 ++++++++++++++++--- .../platform/messaging/domain/Consts.java | 1 + 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java index 82b5a7559..6d2afc5cd 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java @@ -17,7 +17,7 @@ public class ResultContainer { private Long groupId; private StageResult lastStageResult; private LocalDateTime registrationDateTime; - private String mamberCode; + private String memberCode; protected ResultContainer() {} @@ -76,11 +76,11 @@ public class ResultContainer { this.registrationDateTime = registrationDateTime; } - public String getMamberCode() { - return mamberCode; + public String getMemberCode() { + return memberCode; } - public void setMamberCode(String mamberCode) { - this.mamberCode = mamberCode; + public void setMemberCode(String memberCode) { + this.memberCode = memberCode; } } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java index bc51d59e6..8e4152a6e 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java @@ -36,7 +36,7 @@ public enum FilenameTemplate { return appendSection(resultContainer) .append(dateTime(resultContainer)) .append(counter(resultContainer, files)) - .append(mamberCode(resultContainer)) + .append(memberCode(resultContainer)) .append(".DBF").toString(); } }; @@ -66,10 +66,10 @@ public enum FilenameTemplate { return result; } - protected StringBuilder mamberCode(ResultContainer resultContainer) { + protected StringBuilder memberCode(ResultContainer resultContainer) { StringBuilder result = new StringBuilder(); result.append('_'); - result.append(resultContainer.getMamberCode()); + result.append(resultContainer.getMemberCode()); return result; } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java index 2c3acd3f1..c80b9ec07 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java @@ -1,6 +1,8 @@ package ru.spcex.clearing.dbf.exporter.services; 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.spcex.clearing.dbf.exporter.logic.Processor; @@ -9,6 +11,7 @@ import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.balance.ExportToFileRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.clearing.Sdf56And51Request; import ru.spcex.clearing.platform.messaging.domain.cud.clearing.SdfClearingRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -18,6 +21,7 @@ import java.util.Optional; @Service public class CommandService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); private final ImdgProvider imdgProvider; private final Processor processor; @@ -56,9 +60,9 @@ public class CommandService extends QueueConsumer implements InitializingBean { callback(SdfClearingRequest.class) .setConsumer(r -> processSpecial(Table.S_DF54, r)) .forDestination(Consts.SDF54_PROCESS, callbacks::put); - callback(SdfClearingRequest.class) - .setConsumer(r -> processSpecial(Table.S_DF56, r)) - .forDestination(Consts.SDF56_PROCESS, callbacks::put); + callback(Sdf56And51Request.class) + .setConsumer(r -> revise(r)) + .forDestination(Consts.REVISE_PROCESS, callbacks::put); init(); } @@ -80,4 +84,20 @@ public class CommandService extends QueueConsumer implements InitializingBean { resultContainer.setGroupId(request.getGroupId()); processor.process(resultContainer); } + + private void revise(BaseRequest systemRequest) { + Sdf56And51Request sdf56And51Request = systemRequest.getRequestPayload(); + log.debug("Not implemented sdf56 and sdf51 request"); + { + ResultContainer resultContainer = ResultContainer.createNewTask(Table.S_DF56); + resultContainer.setGroupId(null); + processor.process(resultContainer); + } + + { + ResultContainer resultContainer = ResultContainer.createNewTask(Table.S_DF51); + resultContainer.setGroupId(null); + processor.process(resultContainer); + } + } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java index 4ddec1fd1..f19bf4da3 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java @@ -118,6 +118,7 @@ public interface Consts { String SDF54_PROCESS = "sdf54-process"; String SDF56_PROCESS = "sdf56-process"; String SDF57_PROCESS = "sdf57-process"; + String REVISE_PROCESS = "revise-process"; String EXPORT_PROCESS = "export-process"; String EXPORT_COMPLETED = "export_completed"; String S_TRADES_IMPORTED = "s_trades-imported";