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

scheduler-service fix NullPointerException в backend-api.RequestInfoAccepter: userRequest.id и userId пробрасывается также.

Browse source
This commit is contained in:
AKurakin 2023-08-18 16:02:58 +03:00
parent 51ccc27090
commit 50494d87c0
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java
View file

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