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

TimeZone name links

Browse Source
This commit is contained in:
Andrii Shvaika 2024-01-11 12:51:52 +02:00
parent 7fc2231189
commit ee08f33d98
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/data/src/main/java/org/thingsboard/server/common/data/kv/AggregationParams.java
View File

@ -19,18 +19,18 @@ import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.thingsboard.server.common.data.StringUtils; import org.thingsboard.server.common.data.StringUtils;
import java.time.DateTimeException; import java.time.DateTimeException;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.zone.ZoneRulesException; import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@AllArgsConstructor @AllArgsConstructor
@EqualsAndHashCode @EqualsAndHashCode
@Slf4j @Slf4j
public class AggregationParams { public class AggregationParams {
private static final Map<String, String> TZ_LINKS = Map.of("EST", "America/New_York", "GMT+0", "GMT", "GMT-0", "GMT", "HST", "US/Hawaii", "MST", "America/Phoenix", "ROC", "Asia/Taipei");
@Getter @Getter
private final Aggregation aggregation; private final Aggregation aggregation;
@Getter @Getter
@ -83,7 +83,7 @@ public class AggregationParams {
return ZoneId.systemDefault(); return ZoneId.systemDefault();
} }
try { try {
return ZoneId.of(tzIdStr); return ZoneId.of(tzIdStr, TZ_LINKS);
} catch (DateTimeException e) { } catch (DateTimeException e) {
log.warn("[{}] Failed to convert the time zone. Fallback to default.", tzIdStr); log.warn("[{}] Failed to convert the time zone. Fallback to default.", tzIdStr);
return ZoneId.systemDefault(); return ZoneId.systemDefault();