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

Correct call of dependent methods

Browse Source
This commit is contained in:
AndrewVolosytnykhThingsboard 2021-04-14 17:10:50 +03:00 committed by Andrew Shvayka
parent fad1040f24
commit 5d64775f67
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,7 +327,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
addTimePageLinkToParam(params, pageLink); addTimePageLinkToParam(params, pageLink);
return restTemplate.exchange( return restTemplate.exchange(
baseURL + urlSecondPart + getUrlParams(pageLink) + getTimeUrlParams(pageLink), baseURL + urlSecondPart + getTimeUrlParams(pageLink),
HttpMethod.GET, HttpMethod.GET,
HttpEntity.EMPTY, HttpEntity.EMPTY,
new ParameterizedTypeReference<PageData<AlarmInfo>>() { new ParameterizedTypeReference<PageData<AlarmInfo>>() {
@ -2853,7 +2853,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
} }
private String getTimeUrlParams(TimePageLink pageLink) { private String getTimeUrlParams(TimePageLink pageLink) {
String urlParams = ""; String urlParams = getUrlParams(pageLink);
if (pageLink.getStartTime() != null) { if (pageLink.getStartTime() != null) {
urlParams += "&startTime={startTime}"; urlParams += "&startTime={startTime}";
} }