From 15dd5dc9caea007ce9d725cfdb0bbd06beca93e1 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 29 Sep 2020 09:51:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/configuration/SmartDateDeserializer.java | 4 ++++ .../java/org/jetlinks/community/utils/DateMathParser.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/SmartDateDeserializer.java b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/SmartDateDeserializer.java index 44da7b50..c1e36468 100644 --- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/SmartDateDeserializer.java +++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/SmartDateDeserializer.java @@ -20,6 +20,10 @@ public class SmartDateDeserializer extends JsonDeserializer { } return TimeUtils.parseDate(str); } + if (p.hasToken(JsonToken.VALUE_NUMBER_INT)) { + long ts = p.getLongValue(); + return new Date(ts); + } return null; } } diff --git a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/utils/DateMathParser.java b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/utils/DateMathParser.java index b103b48b..6292e302 100644 --- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/utils/DateMathParser.java +++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/utils/DateMathParser.java @@ -22,6 +22,7 @@ package org.jetlinks.community.utils; import lombok.SneakyThrows; import org.hswebframework.utils.time.DateFormatter; +import org.jetlinks.core.metadata.types.DateTimeType; import org.springframework.util.StringUtils; import java.time.*; @@ -166,6 +167,6 @@ public class DateMathParser { if (StringUtils.isEmpty(value)) { throw new IllegalArgumentException("cannot parse empty date"); } - return DateFormatter.fromString(value).getTime(); + return DateTimeType.GLOBAL.convert(value).getTime(); } }