From add4335677847d5eafb97fb85e63dd67b25126f0 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 8 Aug 2023 16:51:26 +0300 Subject: [PATCH] stmtService log + swt-importer sdf21 message --- .../java/ru/spcex/clearing/service/StatementServiceV2.java | 4 ++-- .../swt/importer/logic/stages/SWTImportKafkaMessenger.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementServiceV2.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementServiceV2.java index 3876a9781..f15e6708a 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementServiceV2.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementServiceV2.java @@ -66,7 +66,7 @@ public class StatementServiceV2 { private static StatementRequest find(SdfTable table, Collection reqs) { Optional first = reqs.stream().filter(r -> r.getTable().equals(table)).findFirst(); if (first.isEmpty()) { - throw new IllegalStateException("couldn't find + " + table + " - this should have happened "); + throw new IllegalStateException("couldn't find + " + table + " - this shouldn't have happened "); } return first.get(); } @@ -134,7 +134,7 @@ public class StatementServiceV2 { for (StatementRequest stmtReqOld : statementRequests) { //проходим с головы (с самых старых) boolean matchGroup = group.getGroup().contains(stmtReqOld.getTable()); boolean notIncludedThisTableAlready = reqs.stream().map(StatementRequest::getTable).noneMatch(t -> t.equals(stmtReqOld.getTable())); - boolean isNotTheSameAsNewReq = Objects.equals(stmtReqOld.getTable(), stmtReq.getTable()); + boolean isNotTheSameAsNewReq = !Objects.equals(stmtReqOld.getTable(), stmtReq.getTable()); if (matchGroup && notIncludedThisTableAlready && isNotTheSameAsNewReq) { reqs.add(stmtReqOld); } diff --git a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/SWTImportKafkaMessenger.java b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/SWTImportKafkaMessenger.java index 260b1f4c2..0e5f6ef81 100644 --- a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/SWTImportKafkaMessenger.java +++ b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/SWTImportKafkaMessenger.java @@ -31,6 +31,7 @@ public class SWTImportKafkaMessenger implements InitializingBean { messengers.put(ETable.S_DF_08, groupId -> messageBalance(groupId, SdfTable.SDF_08)); messengers.put(ETable.S_DF_10, groupId -> messageBalance(groupId, SdfTable.SDF_10)); messengers.put(ETable.S_DF_13, groupId -> messageBalance(groupId, SdfTable.SDF_13)); + messengers.put(ETable.S_DF_21, groupId -> messageBalance(groupId, SdfTable.SDF_21)); } /**