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

Fixed incorrect adding of additional parameters to URL in getAlarms method

Browse Source
This commit is contained in:
AndrewVolosytnykhThingsboard 2021-04-19 15:36:38 +03:00 committed by Andrew Shvayka
parent e3caf24a9b
commit 91e0a77afd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,18 +305,18 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
} }
public PageData<AlarmInfo> getAlarms(EntityId entityId, AlarmSearchStatus searchStatus, AlarmStatus status, TimePageLink pageLink, Boolean fetchOriginator) { public PageData<AlarmInfo> getAlarms(EntityId entityId, AlarmSearchStatus searchStatus, AlarmStatus status, TimePageLink pageLink, Boolean fetchOriginator) {
String urlSecondPart = "/api/alarm/{entityType}/{entityId}?fetchOriginator={fetchOriginator}&"; String urlSecondPart = "/api/alarm/{entityType}/{entityId}?fetchOriginator={fetchOriginator}";
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
params.put("entityType", entityId.getEntityType().name()); params.put("entityType", entityId.getEntityType().name());
params.put("entityId", entityId.getId().toString()); params.put("entityId", entityId.getId().toString());
params.put("fetchOriginator", String.valueOf(fetchOriginator)); params.put("fetchOriginator", String.valueOf(fetchOriginator));
if(searchStatus != null) { if(searchStatus != null) {
params.put("searchStatus", searchStatus.name()); params.put("searchStatus", searchStatus.name());
urlSecondPart += "searchStatus={searchStatus}&"; urlSecondPart += "&searchStatus={searchStatus}";
} }
if(status != null) { if(status != null) {
params.put("status", status.name()); params.put("status", status.name());
urlSecondPart += "status={status}&"; urlSecondPart += "&status={status}";
} }
addTimePageLinkToParam(params, pageLink); addTimePageLinkToParam(params, pageLink);