From dd117b09b17519a9510ad57c0e5d8820fab859da Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Wed, 21 Dec 2022 12:33:38 +0300
Subject: [PATCH] balance-service fix

---
 .../spcex/clearing/balance/config/SdfExecutorsConfig.java | 8 +++++++-
 .../importer/logic/stages/DbfImportKafkaMessenger.java    | 8 +++++---
 .../main/java/ru/spcex/platform/enumeration/SdfTable.java | 4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/config/SdfExecutorsConfig.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/config/SdfExecutorsConfig.java
index b36d68aa9..9cf397465 100644
--- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/config/SdfExecutorsConfig.java
+++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/config/SdfExecutorsConfig.java
@@ -4,6 +4,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import ru.spcex.clearing.balance.service.AbstractExecutor;
 import ru.spcex.clearing.balance.service.Sdf01Executor;
+import ru.spcex.clearing.balance.service.Sdf09Executor;
+import ru.spcex.clearing.balance.service.Sdf16Executor;
 import ru.spcex.platform.classes.base.interfaces.WithAccount;
 import ru.spcex.platform.enumeration.SdfTable;
 
@@ -14,9 +16,13 @@ import java.util.Map;
 public class SdfExecutorsConfig {
 
     @Bean("sdfExecutors")
-    public Map<SdfTable, AbstractExecutor<? extends WithAccount>> executorsMap(Sdf01Executor sdf01Executor) {
+    public Map<SdfTable, AbstractExecutor<? extends WithAccount>> executorsMap(Sdf01Executor sdf01Executor,
+                                                                               Sdf09Executor sdf09Executor,
+                                                                               Sdf16Executor sdf16Executor) {
         Map<SdfTable, AbstractExecutor<? extends WithAccount>> executors = new HashMap<>();
         executors.put(SdfTable.SDF_01, sdf01Executor);
+        executors.put(SdfTable.SDF_09, sdf09Executor);
+        executors.put(SdfTable.SDF_16, sdf16Executor);
         return executors;
     }
 }
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 2706c2476..fffcfcab0 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
@@ -26,7 +26,9 @@ public class DbfImportKafkaMessenger implements InitializingBean {
 
     @Override
     public void afterPropertiesSet() {
-        messengers.put(ETable.DF_01, this::messageDf01);
+        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_04, this::messageDf04);
     }
 
@@ -41,10 +43,10 @@ public class DbfImportKafkaMessenger implements InitializingBean {
         }
     }
 
-    private void messageDf01(Long groupId) {
+    private void messageBalance(Long groupId, SdfTable table) {
         StatementRequest statementRequest = new StatementRequest();
         statementRequest.setGroupId(groupId);
-        statementRequest.setTable(SdfTable.SDF_01);
+        statementRequest.setTable(table);
         kafka.get().sendRequestToQueue(Consts.STATEMENT_PROCESS, statementRequest);
     }
 
diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SdfTable.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SdfTable.java
index 8cb3a01d2..988f55a0c 100644
--- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SdfTable.java
+++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SdfTable.java
@@ -3,13 +3,13 @@ package ru.spcex.platform.enumeration;
 import ru.spcex.platform.utils.enumeration.IEnumKey;
 
 public enum SdfTable implements IEnumKey {
-    SDF_01("SDF_01");
+    SDF_01("SDF_01"), SDF_09("SDF_09"), SDF_16("SDF_16");
 
     SdfTable(String key) {
         this.key = key;
     }
 
-    private String key;
+    private final String key;
 
     @Override
     public String getKey() {