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

Fixed incorrect params in the get timeseries request

Browse Source
This commit is contained in:
Bohdan Smetaniuk 2020-04-18 00:33:24 +03:00 committed by Andrew Shvayka
parent 149ec2804b
commit c3bd2a0ebe
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
View File

@ -1646,7 +1646,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
addPageLinkToParam(params, pageLink); addPageLinkToParam(params, pageLink);
Map<String, List<JsonNode>> timeseries = restTemplate.exchange( Map<String, List<JsonNode>> 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, HttpMethod.GET,
HttpEntity.EMPTY, HttpEntity.EMPTY,
new ParameterizedTypeReference<Map<String, List<JsonNode>>>() { new ParameterizedTypeReference<Map<String, List<JsonNode>>>() {
@ -1998,17 +1998,25 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
} }
private String getUrlParams(TimePageLink pageLink) { 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) { if (pageLink.getStartTime() != null) {
urlParams += "&startTime={startTime}"; urlParams.append("&").append(startTime).append("={startTime}");
} }
if (pageLink.getEndTime() != null) { if (pageLink.getEndTime() != null) {
urlParams += "&endTime={endTime}"; urlParams.append("&").append(endTime).append("={endTime}");
} }
if (pageLink.getIdOffset() != null) { if (pageLink.getIdOffset() != null) {
urlParams += "&offset={offset}"; urlParams.append("&offset={offset}");
} }
return urlParams; return urlParams.toString();
} }
private String getUrlParams(TextPageLink pageLink) { private String getUrlParams(TextPageLink pageLink) {