Showing
4 changed files
with
4 additions
and
8 deletions
... | ... | @@ -72,7 +72,7 @@ export class AlarmService { |
72 | 72 | |
73 | 73 | public getHighestAlarmSeverity(entityId: EntityId, alarmSearchStatus: AlarmSearchStatus, alarmStatus: AlarmStatus, |
74 | 74 | config?: RequestConfig): Observable<AlarmSeverity> { |
75 | - let url = `/api/alarm/highestSeverity/${entityId.entityType}/${entityId.entityType}`; | |
75 | + let url = `/api/alarm/highestSeverity/${entityId.entityType}/${entityId.id}`; | |
76 | 76 | if (alarmSearchStatus) { |
77 | 77 | url += `?searchStatus=${alarmSearchStatus}`; |
78 | 78 | } else if (alarmStatus) { | ... | ... |
... | ... | @@ -108,7 +108,7 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink> |
108 | 108 | } |
109 | 109 | |
110 | 110 | fetchAlarms(pageLink: TimePageLink): Observable<PageData<AlarmInfo>> { |
111 | - const query = new AlarmQuery(this.entityId, pageLink, this.searchStatus, null, true, null); | |
111 | + const query = new AlarmQuery(this.entityId, pageLink, this.searchStatus, null, true); | |
112 | 112 | return this.alarmService.getAlarms(query); |
113 | 113 | } |
114 | 114 | ... | ... |
... | ... | @@ -201,17 +201,15 @@ export class AlarmQuery { |
201 | 201 | searchStatus: AlarmSearchStatus; |
202 | 202 | status: AlarmStatus; |
203 | 203 | fetchOriginator: boolean; |
204 | - offset: string; | |
205 | 204 | |
206 | 205 | constructor(entityId: EntityId, pageLink: TimePageLink, |
207 | 206 | searchStatus: AlarmSearchStatus, status: AlarmStatus, |
208 | - fetchOriginator: boolean, offset: string) { | |
207 | + fetchOriginator: boolean) { | |
209 | 208 | this.affectedEntityId = entityId; |
210 | 209 | this.pageLink = pageLink; |
211 | 210 | this.searchStatus = searchStatus; |
212 | 211 | this.status = status; |
213 | 212 | this.fetchOriginator = fetchOriginator; |
214 | - this.offset = offset; | |
215 | 213 | } |
216 | 214 | |
217 | 215 | public toQuery(): string { |
... | ... | @@ -225,9 +223,6 @@ export class AlarmQuery { |
225 | 223 | if (typeof this.fetchOriginator !== 'undefined' && this.fetchOriginator !== null) { |
226 | 224 | query += `&fetchOriginator=${this.fetchOriginator}`; |
227 | 225 | } |
228 | - if (isString(this.offset) && this.offset.length) { | |
229 | - query += `&offset=${this.offset}`; | |
230 | - } | |
231 | 226 | return query; |
232 | 227 | } |
233 | 228 | ... | ... |
... | ... | @@ -506,6 +506,7 @@ export interface DeviceProfile extends BaseData<DeviceProfileId> { |
506 | 506 | export interface DeviceProfileInfo extends EntityInfoData { |
507 | 507 | type: DeviceProfileType; |
508 | 508 | transportType: DeviceTransportType; |
509 | + image?: string; | |
509 | 510 | } |
510 | 511 | |
511 | 512 | export interface DefaultDeviceConfiguration { | ... | ... |