Grouping interval structures

application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java

@@ -21,6 +21,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.time.ZoneId;
 import java.util.Arrays;
 
 @SpringBootConfiguration
@@ -33,7 +34,10 @@ public class ThingsboardServerApplication {
     private static final String DEFAULT_SPRING_CONFIG_PARAM = SPRING_CONFIG_NAME_KEY + "=" + "thingsboard";
 
     public static void main(String[] args) {
-        SpringApplication.run(ThingsboardServerApplication.class, updateArguments(args));
+
+        ZoneId.getAvailableZoneIds().stream().sorted().forEach(System.out::println);
+
+//        SpringApplication.run(ThingsboardServerApplication.class, updateArguments(args));
     }
 
     private static String[] updateArguments(String[] args) {

application/src/main/java/org/thingsboard/server/service/ws/telemetry/cmd/v2/EntityHistoryCmd.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.service.ws.telemetry.cmd.v2;
 
 import lombok.Data;
 import org.thingsboard.server.common.data.kv.Aggregation;
+import org.thingsboard.server.common.data.kv.IntervalType;
 
 import java.util.List;
 
@@ -26,7 +27,9 @@ public class EntityHistoryCmd implements GetTsCmd {
     private List<String> keys;
     private long startTs;
     private long endTs;
+    private IntervalType intervalType;
     private long interval;
+    private String timeZoneId;
     private int limit;
     private Aggregation agg;
     private boolean fetchLatestPreviousPoint;

application/src/main/java/org/thingsboard/server/service/ws/telemetry/cmd/v2/GetTsCmd.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.service.ws.telemetry.cmd.v2;
 
 import org.thingsboard.server.common.data.kv.Aggregation;
+import org.thingsboard.server.common.data.kv.IntervalType;
 
 import java.util.List;
 
@@ -27,8 +28,12 @@ public interface GetTsCmd {
 
     List<String> getKeys();
 
+    IntervalType getIntervalType();
+
     long getInterval();
 
+    String getTimeZoneId();
+
     int getLimit();
 
     Aggregation getAgg();

application/src/main/java/org/thingsboard/server/service/ws/telemetry/cmd/v2/TimeSeriesCmd.java

@@ -18,6 +18,7 @@ package org.thingsboard.server.service.ws.telemetry.cmd.v2;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.thingsboard.server.common.data.kv.Aggregation;
+import org.thingsboard.server.common.data.kv.IntervalType;
 
 import java.util.List;
 
@@ -27,7 +28,9 @@ public class TimeSeriesCmd implements GetTsCmd {
     private List<String> keys;
     private long startTs;
     private long timeWindow;
+    private IntervalType intervalType;
     private long interval;
+    private String timeZoneId;
     private int limit;
     private Aggregation agg;
     private boolean fetchLatestPreviousPoint;

common/data/src/main/java/org/thingsboard/server/common/data/kv/IntervalType.java

@@ -0,0 +1,22 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.kv;
+
+public enum IntervalType {
+
+    MILLISECONDS, WEEK, WEEK_ISO, MONTH, QUARTER
+
+}