treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-36 bug fix

Browse source
This commit is contained in:
ialbert 2022-12-12 17:08:35 +03:00
parent d4767d5937
commit d28b12f68e
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/DbfImportKafkaMessenger.java
View file

@ -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.balance.StatementRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.clearing.Sdf04Request; import ru.spcex.clearing.platform.messaging.domain.cud.clearing.Sdf04Request;
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
import ru.spcex.platform.enumeration.SdfTable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -43,6 +44,7 @@ public class DbfImportKafkaMessenger implements InitializingBean {
private void messageDf01(Long groupId) { private void messageDf01(Long groupId) {
StatementRequest statementRequest = new StatementRequest(); StatementRequest statementRequest = new StatementRequest();
statementRequest.setGroupId(groupId); statementRequest.setGroupId(groupId);
statementRequest.setTable(SdfTable.SDF_01);
kafka.get().sendRequestToQueue(Consts.STATEMENT_PROCESS, statementRequest); kafka.get().sendRequestToQueue(Consts.STATEMENT_PROCESS, statementRequest);
} }

6
clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFImporterService.java
View file

@ -45,10 +45,12 @@ public class DBFImporterService {
executorService.execute(() -> { executorService.execute(() -> {
log.info("checking new files... {}", specificTable != null ? specificTable.name() : ""); log.info("checking new files... {}", specificTable != null ? specificTable.name() : "");
Map<ETable, List<File>> newFiles = fileChecker.checkNewFiles(specificTable); Map<ETable, List<File>> newFiles = fileChecker.checkNewFiles(specificTable);
if (log.isDebugEnabled()) { if (newFiles.size() > 0 && log.isDebugEnabled()) {
log.debug("following files will be processed {}", forLogging(newFiles)); log.debug("following files will be processed {}", forLogging(newFiles));
} else { } else if (newFiles.size() > 0) {
log.info("following files will be processed {}", forLoggingSizeOnly(newFiles)); log.info("following files will be processed {}", forLoggingSizeOnly(newFiles));
} else {
log.info("no files were found");
} }
for (Map.Entry<ETable, List<File>> newFilesEntry : newFiles.entrySet()) { for (Map.Entry<ETable, List<File>> newFilesEntry : newFiles.entrySet()) {
ETable currTable = newFilesEntry.getKey(); ETable currTable = newFilesEntry.getKey();

8
platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java
View file

@ -90,8 +90,8 @@ public class ImdgHazelcast<T extends SpcexObjectBase> implements Imdg<T> {
predicates[i[0]] = Predicates.equal(key, value); predicates[i[0]] = Predicates.equal(key, value);
i[0]++; i[0]++;
}); });
Predicate<Long, T> or = Predicates.or(predicates); Predicate<Long, T> and = Predicates.and(predicates);
Set<Map.Entry<Long, T>> found = map.entrySet(or); Set<Map.Entry<Long, T>> found = map.entrySet(and);
Iterator<Map.Entry<Long, T>> allFoundByCondition = found.iterator(); Iterator<Map.Entry<Long, T>> allFoundByCondition = found.iterator();
if (allFoundByCondition.hasNext()) { if (allFoundByCondition.hasNext()) {
return allFoundByCondition.next().getValue(); return allFoundByCondition.next().getValue();
@ -122,8 +122,8 @@ public class ImdgHazelcast<T extends SpcexObjectBase> implements Imdg<T> {
predicates[i[0]] = Predicates.equal(key, value); predicates[i[0]] = Predicates.equal(key, value);
i[0]++; i[0]++;
}); });
Predicate<Long, T> or = Predicates.or(predicates); Predicate<Long, T> and = Predicates.and(predicates);
Set<Long> ids = map.keySet(or); Set<Long> ids = map.keySet(and);
Iterator<Long> idIterator = ids.iterator(); Iterator<Long> idIterator = ids.iterator();
Collection<T> searchResult = new ArrayList<>(); Collection<T> searchResult = new ArrayList<>();
while (idIterator.hasNext()) { while (idIterator.hasNext()) {