From eae1e816dad5989f7b2c8266731a9ad835194794 Mon Sep 17 00:00:00 2001 From: ialbert Date: Mon, 19 Jun 2023 18:10:14 +0300 Subject: [PATCH] statement service bugfix --- .../clearing/config/SdfExecutorsConfig.java | 4 +--- .../clearing/service/StatementService.java | 22 +------------------ 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SdfExecutorsConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SdfExecutorsConfig.java index 45889772a..13c3dd6af 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SdfExecutorsConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SdfExecutorsConfig.java @@ -16,15 +16,13 @@ public class SdfExecutorsConfig { Sdf57Executor sdf57Executor, Sdf04Executor sdf04Executor, Sdf13Executor sdf13Executor, - Sdf08Executor sdf08Executor, - Sdf06Executor sdf06Executor) { + Sdf08Executor sdf08Executor) { Map> executors = new HashMap<>(); executors.put(SdfTable.SDF_01, sdf01Executor); executors.put(SdfTable.SDF_57, sdf57Executor); executors.put(SdfTable.SDF_04, sdf04Executor); executors.put(SdfTable.SDF_13, sdf13Executor); executors.put(SdfTable.SDF_08, sdf08Executor); - executors.put(SdfTable.SDF_06, sdf06Executor); return executors; } } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java index c58db99ca..65c2d9c4e 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java @@ -62,31 +62,11 @@ public class StatementService extends QueueConsumer implements InitializingBean @Override public void afterPropertiesSet() throws Exception { callback(StatementRequest.class) - .setConsumer(systemRequest -> { - SdfTable table = systemRequest.getRequestPayload().getTable(); - if (SdfTable.SDF_06.equals(table)) { - processSdf06(systemRequest); - } else { - processPaired(systemRequest); - } - }) + .setConsumer(this::processPaired) .forDestination(Consts.STATEMENT_PROCESS, callbacks::put); init(); } - @SuppressWarnings("unchecked") - private void processSdf06(BaseRequest systemRequest) { - Imdg sdfImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf06, SDf06.class); - Collection sdf06Group = sdfImdg.getCollectionObjectsByFieldValues(Map.of( - "generationId", systemRequest.getRequestPayload().getGroupId() - )); - AbstractExecutor service = (AbstractExecutor) executorsMap.get(SdfTable.SDF_06); - Result res = service.execute(sdf06Group, systemRequest.getRequestPayload()); - if (service.isNeedToSendCommand()) { - service.sendCommand(kafkaSender, res); - } - } - private void processPaired(BaseRequest systemRequest) { StatementRequest statementRequest = systemRequest.getRequestPayload(); SdfTable table = statementRequest.getTable();