diff --git a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java index 7e0dbf3858..f6a6541de0 100644 --- a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java +++ b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java @@ -1646,7 +1646,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable { addPageLinkToParam(params, pageLink); Map> timeseries = restTemplate.exchange( - baseURL + "/api/plugins/telemetry/{entityType}/{entityId}/values/timeseries?keys={keys}&interval={interval}&agg={agg}&useStrictDataTypes={useStrictDataTypes}&" + getUrlParams(pageLink), + baseURL + "/api/plugins/telemetry/{entityType}/{entityId}/values/timeseries?keys={keys}&interval={interval}&agg={agg}&useStrictDataTypes={useStrictDataTypes}&" + getUrlParamsTs(pageLink), HttpMethod.GET, HttpEntity.EMPTY, new ParameterizedTypeReference>>() { @@ -1998,17 +1998,25 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable { } private String getUrlParams(TimePageLink pageLink) { - String urlParams = "limit={limit}&ascOrder={ascOrder}"; + return getUrlParams(pageLink, "startTime", "endTime"); + } + + private String getUrlParamsTs(TimePageLink pageLink) { + return getUrlParams(pageLink, "startTs", "endTs"); + } + + private String getUrlParams(TimePageLink pageLink, String startTime, String endTime) { + StringBuilder urlParams = new StringBuilder("limit={limit}&ascOrder={ascOrder}"); if (pageLink.getStartTime() != null) { - urlParams += "&startTime={startTime}"; + urlParams.append("&").append(startTime).append("={startTime}"); } if (pageLink.getEndTime() != null) { - urlParams += "&endTime={endTime}"; + urlParams.append("&").append(endTime).append("={endTime}"); } if (pageLink.getIdOffset() != null) { - urlParams += "&offset={offset}"; + urlParams.append("&offset={offset}"); } - return urlParams; + return urlParams.toString(); } private String getUrlParams(TextPageLink pageLink) {