diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java index 8f6aa7b79..3c08e822b 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java @@ -81,14 +81,15 @@ public class LauncherService extends QueueConsumer implements InitializingBean { launcherMap.insert(launcher); log.debug("successfully processed, new id {}", launcher.getId()); if (Task.dbfExport_OUTV.equalsByKey(req.getTaskName())) { - processRequestOUTV(Task.dbfExport_OUTV, req); + processRequestOUTV(userRequest, req); } else { kafkaProducer.send(new ProducerRecord<>("launcher-" + launcher.getTask(), userRequest)); } } - private void processRequestOUTV(Task dbfExport__OUTV, LauncherCommandRequest launcherNew) { - log.debug("Redirect {} to queue {}", dbfExport__OUTV, Consts.PAYMENT_INSTRUCTION_CLEARING_OUTBOUND_ACTION); + private void processRequestOUTV(BaseRequest userRequest, LauncherCommandRequest launcherNew) { + log.debug("Redirect {} (userRequest.id={}) to queue {}", launcherNew.getTaskName(), + userRequest.getId(), Consts.PAYMENT_INSTRUCTION_CLEARING_OUTBOUND_ACTION); var req = new PIClearingOutbondActionNewRequest(); req.setSenderId(launcherNew.getSenderId()); req.setAddresseeId(launcherNew.getAddresseeId()); @@ -99,10 +100,11 @@ public class LauncherService extends QueueConsumer implements InitializingBean { final String destination = Consts.PAYMENT_INSTRUCTION_CLEARING_OUTBOUND_ACTION; BaseRequest request = new BaseRequest<>(); - request.setId(null); - request.setActionType(ActionType.NEW); + request.setId(userRequest.getId()); // для уведомлений фронтэнда + request.setActionType(userRequest.getActionType()); request.setRequestPayload(req); - request.setUserId(launcherNew.getUserId()); + request.setUserId(userRequest.getUserId()); + request.setCorrelationId(userRequest.getCorrelationId()); Future send = kafkaProducer.send(new ProducerRecord<>(destination, request)); try { send.get();