Browse Source

Merge 3c5e462c3b into d4329f3b7c

pull/15761/merge
Burak Soykan 3 days ago
committed by GitHub
parent
commit
3c6cea9da8
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      application/src/main/java/org/thingsboard/server/controller/AlarmController.java

2
application/src/main/java/org/thingsboard/server/controller/AlarmController.java

@ -170,7 +170,6 @@ public class AlarmController extends BaseController {
checkParameter(ALARM_ID, strAlarmId);
AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
//TODO: return correct error code if the alarm is not found or already cleared
return tbAlarmService.ack(alarm, getCurrentUser());
}
@ -185,7 +184,6 @@ public class AlarmController extends BaseController {
checkParameter(ALARM_ID, strAlarmId);
AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
//TODO: return correct error code if the alarm is not found or already cleared
return tbAlarmService.clear(alarm, getCurrentUser());
}

Loading…
Cancel
Save