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

Merge pull request #11453 from AldirchEugene/master

Browse Source 
Fixed the problem of getAlarmTypes method query failure in rest-client
This commit is contained in:
Andrew Shvayka 2024-09-09 17:27:36 +03:00 committed by GitHub
commit 14827bb175
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,13 +515,16 @@ public class RestClient implements Closeable {
return restTemplate.postForEntity(baseURL + "/api/alarm", alarm, Alarm.class).getBody(); return restTemplate.postForEntity(baseURL + "/api/alarm", alarm, Alarm.class).getBody();
} }
public List<EntitySubtype> getAlarmTypes(PageLink pageLink) { public PageData<EntitySubtype> getAlarmTypes(PageLink pageLink) {
Map<String, String> params = new HashMap<>();
addPageLinkToParam(params, pageLink);
return restTemplate.exchange( return restTemplate.exchange(
baseURL + "/api/alarm/types?" + getUrlParams(pageLink), baseURL + "/api/alarm/types?" + getUrlParams(pageLink),
HttpMethod.GET, HttpMethod.GET,
HttpEntity.EMPTY, HttpEntity.EMPTY,
new ParameterizedTypeReference<List<EntitySubtype>>() { new ParameterizedTypeReference<PageData<EntitySubtype>>() {
}).getBody(); },
params).getBody();
} }
public AlarmComment saveAlarmComment(AlarmId alarmId, AlarmComment alarmComment) { public AlarmComment saveAlarmComment(AlarmId alarmId, AlarmComment alarmComment) {