From 28d7176a5c4eac9001edaedbd0e0879f5348b3be Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Wed, 24 May 2023 12:43:46 +0300 Subject: [PATCH] delete sdf12 from importer --- .../importer/config/DBFImporterConfig.java | 1 - .../dbf/importer/logic/data/enums/ETable.java | 2 +- .../logic/data/tables/SDf12Table.java | 32 ------------------- .../logic/stages/DbfImportKafkaMessenger.java | 1 + .../services/LauncherCommandReceiver.java | 6 ++-- 5 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf12Table.java diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFImporterConfig.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFImporterConfig.java index ce79d7c98..985ab0715 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFImporterConfig.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFImporterConfig.java @@ -59,7 +59,6 @@ public class DBFImporterConfig { map.put(ETable.DF_01, new SDf01Table()); map.put(ETable.DF_04, new SDf04Table()); map.put(ETable.DF_09, new SDf09Table()); - map.put(ETable.DF_12, new SDf12Table()); map.put(ETable.DF_16, new SDf16Table()); map.put(ETable.DF_57, new SDf57Table()); return map; diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/ETable.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/ETable.java index f2b9bb337..ba5faf9fb 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/ETable.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/ETable.java @@ -4,7 +4,7 @@ public enum ETable { DF_01("DF-01"), DF_04("DF-04"), DF_09("DF-09"), - DF_12("DF-12"), +// DF_12("DF-12"), DF_16("DF-16"), DF_57("DF-57"); diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf12Table.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf12Table.java deleted file mode 100644 index 9aab7d0b3..000000000 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf12Table.java +++ /dev/null @@ -1,32 +0,0 @@ -package ru.spcex.clearing.dbf.importer.logic.data.tables; - -import ru.clearing.classes.statics.data.sdf.SDf12; -import ru.spcex.clearing.dbf.importer.logic.data.enums.ETable; -import ru.spcex.clearing.imdg.IMDGDistributedNames; - -import java.math.BigDecimal; -import java.time.Instant; - -public class SDf12Table extends AbstractTable { - - private static final String PREFIX = ETable.DF_12.name(); - private static final Class CLAZZ = SDf12.class; - private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf12; - - public SDf12Table() { - super(PREFIX, CLAZZ, NAME_OF_HZ_MAP); - } - - @Override - public SDf12 getEntity(Object[] entity) { - SDf12 result = new SDf12(); -// result.setAccount((String) entity[0]); -// result.setDeal((String) entity[1]); - BigDecimal status = (BigDecimal) entity[2]; -// result.setStatus(status != null ? status.longValue() : null); -// result.setFileName(filename); - result.setGenerationTime(Instant.now()); - result.setGenerationId(fileId); - return result; - } -} \ No newline at end of file diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/DbfImportKafkaMessenger.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/DbfImportKafkaMessenger.java index fffcfcab0..283a824d8 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/DbfImportKafkaMessenger.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/DbfImportKafkaMessenger.java @@ -29,6 +29,7 @@ public class DbfImportKafkaMessenger implements InitializingBean { messengers.put(ETable.DF_01, groupId -> messageBalance(groupId, SdfTable.SDF_01)); messengers.put(ETable.DF_09, groupId -> messageBalance(groupId, SdfTable.SDF_09)); messengers.put(ETable.DF_16, groupId -> messageBalance(groupId, SdfTable.SDF_16)); + messengers.put(ETable.DF_57, groupId -> messageBalance(groupId, SdfTable.SDF_57)); messengers.put(ETable.DF_04, this::messageDf04); } diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/LauncherCommandReceiver.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/LauncherCommandReceiver.java index 70dee0b97..9eb424392 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/LauncherCommandReceiver.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/LauncherCommandReceiver.java @@ -23,6 +23,9 @@ public class LauncherCommandReceiver extends QueueConsumer implements Initializi this.importer = importer; } + /** + * В реальности не используется + */ @Override public void afterPropertiesSet() { callback(LauncherCommandRequest.class) @@ -31,9 +34,6 @@ public class LauncherCommandReceiver extends QueueConsumer implements Initializi callback(LauncherCommandRequest.class) .setConsumer(action -> importer.run(ETable.DF_01)) .forDestination(Task.accrualOfBalance.topic(), callbacks::put); // GBAL - callback(LauncherCommandRequest.class) - .setConsumer(action -> importer.run(ETable.DF_12)) - .forDestination(Task.accountBlock.topic(), callbacks::put); // ABLK callback(LauncherCommandRequest.class) .setConsumer(action -> importer.run(ETable.DF_09)) .forDestination(Task.getBalance.topic(), callbacks::put); // GBLD