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 e72cf67f4..2706c2476 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 @@ -7,6 +7,7 @@ import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest; import ru.spcex.clearing.platform.messaging.domain.cud.clearing.Sdf04Request; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; +import ru.spcex.platform.enumeration.SdfTable; import java.util.HashMap; import java.util.Map; @@ -43,6 +44,7 @@ public class DbfImportKafkaMessenger implements InitializingBean { private void messageDf01(Long groupId) { StatementRequest statementRequest = new StatementRequest(); statementRequest.setGroupId(groupId); + statementRequest.setTable(SdfTable.SDF_01); kafka.get().sendRequestToQueue(Consts.STATEMENT_PROCESS, statementRequest); } diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFImporterService.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFImporterService.java index 51eed3b59..fd3b2cdce 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFImporterService.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFImporterService.java @@ -45,10 +45,12 @@ public class DBFImporterService { executorService.execute(() -> { log.info("checking new files... {}", specificTable != null ? specificTable.name() : ""); Map> newFiles = fileChecker.checkNewFiles(specificTable); - if (log.isDebugEnabled()) { + if (newFiles.size() > 0 && log.isDebugEnabled()) { log.debug("following files will be processed {}", forLogging(newFiles)); - } else { + } else if (newFiles.size() > 0) { log.info("following files will be processed {}", forLoggingSizeOnly(newFiles)); + } else { + log.info("no files were found"); } for (Map.Entry> newFilesEntry : newFiles.entrySet()) { ETable currTable = newFilesEntry.getKey(); diff --git a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java index 0db5e0b28..b1e431044 100644 --- a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java +++ b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java @@ -90,8 +90,8 @@ public class ImdgHazelcast implements Imdg { predicates[i[0]] = Predicates.equal(key, value); i[0]++; }); - Predicate or = Predicates.or(predicates); - Set> found = map.entrySet(or); + Predicate and = Predicates.and(predicates); + Set> found = map.entrySet(and); Iterator> allFoundByCondition = found.iterator(); if (allFoundByCondition.hasNext()) { return allFoundByCondition.next().getValue(); @@ -122,8 +122,8 @@ public class ImdgHazelcast implements Imdg { predicates[i[0]] = Predicates.equal(key, value); i[0]++; }); - Predicate or = Predicates.or(predicates); - Set ids = map.keySet(or); + Predicate and = Predicates.and(predicates); + Set ids = map.keySet(and); Iterator idIterator = ids.iterator(); Collection searchResult = new ArrayList<>(); while (idIterator.hasNext()) {