diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java index ce43f8caf4..dbd388e9c0 100644 --- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java +++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java @@ -218,9 +218,12 @@ public class TbDate implements Serializable, Cloneable { return opt; } - public long now() { + public static long now() { return Instant.now().toEpochMilli(); } + public static String nowToString() { + return Instant.now().toString(); + } public long parseSecond() { return instant.getEpochSecond(); diff --git a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java index afc82eaad9..3e71e9ba96 100644 --- a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java +++ b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java @@ -29,7 +29,6 @@ import org.thingsboard.common.util.JacksonUtil; import java.time.DateTimeException; import java.time.ZoneId; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -40,6 +39,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; @@ -484,6 +484,12 @@ class TbDateTest { Assert.assertEquals(expected, d.toLocaleString()); } + @Test + public void TestNow() { + assertTrue(TbDate.now() > 0); + assertNotNull(TbDate.nowToString()); + } + @Test public void TestToUTC() { Assert.assertEquals(-2209075200000L, TbDate.UTC(0));