Browse Source
Merge pull request #6857 from thingsboard/fix_bug_alarm_delete
[3.4]fix bug check Alarm delete
pull/6859/head
Andrew Shvayka
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
application/src/main/java/org/thingsboard/server/controller/AlarmController.java
|
|
|
@ -145,7 +145,7 @@ public class AlarmController extends BaseController { |
|
|
|
public Boolean deleteAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException { |
|
|
|
checkParameter(ALARM_ID, strAlarmId); |
|
|
|
AlarmId alarmId = new AlarmId(toUUID(strAlarmId)); |
|
|
|
Alarm alarm = checkAlarmId(alarmId, Operation.WRITE); |
|
|
|
Alarm alarm = checkAlarmId(alarmId, Operation.DELETE); |
|
|
|
return tbAlarmService.delete(alarm, getCurrentUser()); |
|
|
|
} |
|
|
|
|
|
|
|
|
