From 6c4e26cbe8f576b388075d3f544c91b365b628e4 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 6 May 2025 12:25:19 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-830 --- .../ru/spcex/clearing/service/executors/Sdf57Executor.java | 5 ++++- .../src/main/java/ru/spcex/platform/utils/time/TimeUtil.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java index f85157059..a3c6bcaef 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java @@ -93,6 +93,8 @@ import ru.spcex.platform.utils.log.ExceptionUtils; import ru.spcex.platform.utils.number.BigDecimalUtil; import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; import ru.spcex.platform.utils.text.TextUtil; +import static ru.spcex.platform.utils.time.TimeUtil.formatInstant; +import static ru.spcex.platform.utils.time.TimeUtil.readableDateTime; import ru.spcex.platform.utils.validation.IValidator; @Service @@ -502,10 +504,11 @@ public class Sdf57Executor extends AbstractExecutor { log.debug("stmt.id={} created DMAU.id={}", stmt.getId(), newDmau.getId()); }); //DMAU подразумевает увеличение остатка поля balance и credit registry.code=DMAU + String genTime = formatInstant(sdf57.getGenerationTime(), readableDateTime); notification.sendNotification(ObjectType.rgst, ("Зачисление средств на регистр невыясненных денежных средств. " + "Дата и время поступления: %s. " - + "ID платежного поручения: %d").formatted(sdf57.getGenerationTime(), sdf57.getDbfId()), + + "ID платежного поручения: %d").formatted(genTime, sdf57.getDbfId()), Priority.HIGH); } } else if (OperationStatus.Executed.equalsByKey(stmt.getOperationStatus())) { diff --git a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/time/TimeUtil.java b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/time/TimeUtil.java index af410c60f..674778ab5 100644 --- a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/time/TimeUtil.java +++ b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/time/TimeUtil.java @@ -15,6 +15,7 @@ import java.util.Objects; public class TimeUtil { public static final DateTimeFormatter PROPERTY_DATE_FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy"); + public static final DateTimeFormatter readableDateTime = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss"); public static ZoneId zone = ZoneId.systemDefault(); /**