diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ClearingService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ClearingService.java index 1204c835c..6ca69d137 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ClearingService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ClearingService.java @@ -29,7 +29,7 @@ public class ClearingService implements DisposableBean { this.executor = Executors.newSingleThreadExecutor(); } - @Scheduled(cron = "${clearing-service.scheduler.check-payment-instruction}") +// @Scheduled(cron = "${clearing-service.scheduler.check-payment-instruction}") public void sdfCreate() { log.info("creating sdf03/11 from STLD payments task added to queue"); executor.execute(sdfCreator::createSdfFromPaymentInstructionSTLD); diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java index a23d21a71..3015e0683 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java @@ -9,6 +9,7 @@ import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.balance.ExportToFileRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.clearing.SdfClearingRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -34,6 +35,12 @@ public class CommandService extends QueueConsumer implements InitializingBean { callback(ExportToFileRequest.class) .setConsumer(this::process) .forDestination(Consts.EXPORT_PROCESS, callbacks::put); + callback(SdfClearingRequest.class) + .setConsumer(r -> processSpecial(Table.S_DF03, r)) + .forDestination(Consts.SDF03_PROCESS, callbacks::put); + callback(SdfClearingRequest.class) + .setConsumer(r -> processSpecial(Table.S_DF11, r)) + .forDestination(Consts.SDF11_PROCESS, callbacks::put); init(); } @@ -48,4 +55,11 @@ public class CommandService extends QueueConsumer implements InitializingBean { resultContainer.setGroupId(request.getSdfGroupId()); processor.process(resultContainer); } + + private void processSpecial(Table table, BaseRequest systemRequest) { + SdfClearingRequest request = systemRequest.getRequestPayload(); + ResultContainer resultContainer = ResultContainer.createNewTask(table); + resultContainer.setGroupId(request.getGroupId()); + processor.process(resultContainer); + } }