From 835f9932d956063974c1916279ff29bdf4a52973 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 30 Aug 2023 17:59:16 +0300 Subject: [PATCH] =?UTF-8?q?clearing-service=20http://jira.mfd.msk:8088/bro?= =?UTF-8?q?wse/CLS-508=20Sdf04=20/=20Sdf13=20=D0=BE=D0=B6=D0=B8=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=8C=D1=8E=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE=D0=B9?= =?UTF-8?q?=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B=20=D0=B2=20SessionMonit?= =?UTF-8?q?or?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/ru/spcex/clearing/service/StatementService.java | 2 +- .../java/ru/spcex/clearing/service/executors/Sdf04Executor.java | 2 +- .../java/ru/spcex/clearing/service/executors/Sdf13Executor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 c9b0fa727..05cc606ed 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 @@ -287,7 +287,7 @@ public class StatementService extends QueueConsumer implements InitializingBean NotificationNewRequest nRequest = new NotificationNewRequest(); nRequest.setObjectType(ObjectType.rgst.getKey()); nRequest.setPriority(Priority.HIGH.getKey()); - nRequest.setComment("Поручения из клиринговой системы имеют неисполненный статус в ответе ДФ-13 из расчетной организации"); + nRequest.setComment("Поручения из клиринговой системы имеют неисполненный статус в ответе ДФ-13 из расчетного депозитария"); kafkaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, nRequest); } else { kafkaSender.sendRequestToQueue(Consts.CONTINUE_SESSION_BN_FIRST_PART, continueSessionBn); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java index 75d49fb24..2f2f632ba 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf04Executor.java @@ -71,7 +71,7 @@ public class Sdf04Executor extends AbstractExecutor { public Result execute(Collection sdf, StatementRequest statementRequest) { Result result = new Result(); for (SDf04 sdf04 : sdf) { - if (!StringUtils.startsWith(sdf04.getImp_result(), "OK")) { + if (!StringUtils.contains(sdf04.getImp_result(), "OK")) { log.warn("groupId={} stop execute, cause: sdf04[{}].Imp_result=\"{}\" was not ok.", statementRequest.getGroupId(), sdf04.getId(), sdf04.getImp_result()); result.setAnyHasError(true); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf13Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf13Executor.java index 8b3c8604e..a92425df6 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf13Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf13Executor.java @@ -65,7 +65,7 @@ public class Sdf13Executor extends AbstractExecutor { result.setChildGenerationId(generationIdForGroup); result.setAnyHasError(false); for (SDf13 sdf13 : sdf) { - if (!StringUtils.startsWith(sdf13.getResult(), "OK")) { + if (!StringUtils.contains(sdf13.getResult(), "OK")) { log.warn("groupId={} stop execute cause: sdf13[{}].result=\"{}\" was not ok.", statementRequest.getGroupId(), sdf13.getId(), sdf13.getResult()); result.setAnyHasError(true); return result;