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

Fixed incorrect RestClient method getAlarms

Browse Source
This commit is contained in:
AndrewVolosytnykhThingsboard 2021-04-13 19:36:35 +03:00 committed by Andrew Shvayka
parent e17ba0531d
commit a100d07daf
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,17 +305,25 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
restTemplate.postForLocation(baseURL + "/api/alarm/{alarmId}/clear", null, alarmId.getId()); restTemplate.postForLocation(baseURL + "/api/alarm/{alarmId}/clear", null, alarmId.getId());
} }
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, String offset, Boolean 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());
if(searchStatus != null) {
params.put("searchStatus", searchStatus.name()); params.put("searchStatus", searchStatus.name());
urlSecondPart += "searchStatus={searchStatus}&";
}
if(status != null) {
params.put("status", status.name()); params.put("status", status.name());
urlSecondPart += "status={status}&";
}
params.put("fetchOriginator", String.valueOf(fetchOriginator)); params.put("fetchOriginator", String.valueOf(fetchOriginator));
params.put("offset", offset);
addTimePageLinkToParam(params, pageLink); addTimePageLinkToParam(params, pageLink);
return restTemplate.exchange( return restTemplate.exchange(
baseURL + "/api/alarm/{entityType}/{entityId}?searchStatus={searchStatus}&status={status}&fetchOriginator={fetchOriginator}&" + getTimeUrlParams(pageLink), baseURL + urlSecondPart + getUrlParams(pageLink) + getTimeUrlParams(pageLink),
HttpMethod.GET, HttpMethod.GET,
HttpEntity.EMPTY, HttpEntity.EMPTY,
new ParameterizedTypeReference<PageData<AlarmInfo>>() { new ParameterizedTypeReference<PageData<AlarmInfo>>() {
@ -2841,7 +2849,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
} }
private String getTimeUrlParams(TimePageLink pageLink) { private String getTimeUrlParams(TimePageLink pageLink) {
String urlParams = "limit={limit}&ascOrder={ascOrder}"; String urlParams = "";
if (pageLink.getStartTime() != null) { if (pageLink.getStartTime() != null) {
urlParams += "&startTime={startTime}"; urlParams += "&startTime={startTime}";
} }