diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/BalanceRevise.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/BalanceRevise.java index ba757fb8d..06ad2680b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/BalanceRevise.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/BalanceRevise.java @@ -99,12 +99,16 @@ public class BalanceRevise implements ISessionStage { Collection currencies = currencyImdg.projectSingleAttribute("id"); Long millis = null; if (fromTime != null) { + log.debug("sendSdf, parameter fromTime={}", fromTime); Instant fromInstant = TimeUtil.localDateTimeToInstant(LocalDateTime.of(LocalDate.now(), fromTime)); millis = fromInstant.toEpochMilli(); } else { Statement statement = statementImdg.aggregateByMax("created", StatementRevisePredicate.get(statementImdg, currencies)); if (statement != null) { + log.debug("sendSdf, parameter fromTime not set, use max(statement.created)={}", statement.getCreated()); millis = statement.getCreated().toEpochMilli(); + } else { + log.debug("sendSdf, parameter fromTime not set, and statement's not found."); } } newSDf56(millis); diff --git a/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/time/TimeUtilTest.java b/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/time/TimeUtilTest.java index ee5bff21b..594b8480a 100644 --- a/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/time/TimeUtilTest.java +++ b/platform-parent/platform-utils/src/test/java/ru/spcex/platform/utils/time/TimeUtilTest.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test; import java.time.Instant; import java.time.LocalDate; +import java.time.LocalDateTime; import static org.junit.jupiter.api.Assertions.*; @@ -15,4 +16,11 @@ class TimeUtilTest { LocalDate date2 = TimeUtil.toLocalDate(date1); assertEquals("2009-02-14", date2.toString()); } + + @Test + void localDateTimeToInstant() { + Instant theI = TimeUtil.localDateTimeToInstant(LocalDateTime.of(2024, 2, 9, 10, 11, 22)); + assertEquals("2024-02-09T07:11:22Z", theI.toString()); // msk = UTC+3 + assertEquals(1707462682L, theI.getEpochSecond()); + } } \ No newline at end of file