dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tbDate:fix bug now

Browse Source
This commit is contained in:
nick 2023-11-02 12:21:37 +02:00
parent c42599c0d9
commit e7dc68f18f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java
View File

@ -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();

8
common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java
View File

@ -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));