feat:OpenApi新增 设备历史数据查询接口

@@ -47,6 +47,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.kv.AggregationParams;
 import org.thingsboard.server.common.data.kv.AggregationParams;
 import org.thingsboard.server.common.data.kv.IntervalType;
 import org.thingsboard.server.common.data.kv.IntervalType;
+import org.thingsboard.server.common.data.yunteng.dto.TimeseriesDTO;
 import org.thingsboard.server.common.msg.rule.engine.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.server.common.msg.rule.engine.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
@@ -291,6 +292,29 @@ public class TelemetryController extends BaseController {
                 (result, tenantId, entityId) -> getLatestTimeseriesValuesCallback(result, user, entityId, keysStr, useStrictDataTypes));
                 (result, tenantId, entityId) -> getLatestTimeseriesValuesCallback(result, user, entityId, keysStr, useStrictDataTypes));
     }
     }
 
 
+    //thingskit start
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER', 'OPENAPI_USER')")
+    @RequestMapping("/getTimeseries")
+    @ApiOperation("OpenApi查询设备历史数据")
+    public DeferredResult<ResponseEntity> getTimeseries(
+            @RequestBody  TimeseriesDTO queryMap)
+            throws ThingsboardException {
+        return getTimeseries(
+                "DEVICE",
+                null!=queryMap.getDeviceId()?queryMap.getDeviceId():null,
+                null!=queryMap.getKeys()?queryMap.getKeys():null,
+                null!=queryMap.getStartTime()?queryMap.getStartTime():null,
+                null!=queryMap.getEndTime()?queryMap.getEndTime():null,
+                null,
+                null!=queryMap.getInterval()?queryMap.getInterval():null,
+                null,
+                null!=queryMap.getLimit()?queryMap.getLimit():100,
+                null!=queryMap.getAgg()?queryMap.getAgg():null,
+                null!=queryMap.getSortOrder()?queryMap.getSortOrder():null,
+                false);
+    }
+    //thingskit end
+
     @ApiOperation(value = "Get time-series data (getTimeseries)",
     @ApiOperation(value = "Get time-series data (getTimeseries)",
             notes = "Returns a range of time-series values for specified entity. " +
             notes = "Returns a range of time-series values for specified entity. " +
                     "Returns not aggregated data by default. " +
                     "Returns not aggregated data by default. " +
@@ -301,7 +325,7 @@ public class TelemetryController extends BaseController {
                     + MARKDOWN_CODE_BLOCK_END
                     + MARKDOWN_CODE_BLOCK_END
                     + "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
                     + "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
             produces = MediaType.APPLICATION_JSON_VALUE)
             produces = MediaType.APPLICATION_JSON_VALUE)
-    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER','OPENAPI_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/values/timeseries", method = RequestMethod.GET, params = {"keys", "startTs", "endTs"})
     @RequestMapping(value = "/{entityType}/{entityId}/values/timeseries", method = RequestMethod.GET, params = {"keys", "startTs", "endTs"})
     @ResponseBody
     @ResponseBody
     public DeferredResult<ResponseEntity> getTimeseries(
     public DeferredResult<ResponseEntity> getTimeseries(

@@ -45,6 +45,7 @@ public class DefaultAccessControlService implements AccessControlService {
         authorityPermissions.put(Authority.SYS_ADMIN, sysAdminPermissions);
         authorityPermissions.put(Authority.SYS_ADMIN, sysAdminPermissions);
         authorityPermissions.put(Authority.TENANT_ADMIN, tenantAdminPermissions);
         authorityPermissions.put(Authority.TENANT_ADMIN, tenantAdminPermissions);
         authorityPermissions.put(Authority.CUSTOMER_USER, customerUserPermissions);
         authorityPermissions.put(Authority.CUSTOMER_USER, customerUserPermissions);
+        authorityPermissions.put(Authority.OPENAPI_USER, customerUserPermissions);
     }
     }
 
 
     @Override
     @Override

+package org.thingsboard.server.common.data.yunteng.dto;
+import lombok.Data;
+
+@Data
+public class TimeseriesDTO {
+  private String deviceId;
+  private String keys;
+  private Long interval;
+  private String agg;
+  private String sortOrder;
+  private Long startTime;
+  private Long endTime;
+  private Integer limit;
+}