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

Fix alarm deletion WS update

Browse Source
This commit is contained in:
Andrii Shvaika 2023-11-06 13:16:27 +02:00
parent 1a881f6038
commit 5702d9654a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
View File

@ -188,6 +188,7 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
if (alarm == null) { if (alarm == null) {
return AlarmApiCallResult.builder().successful(false).build(); return AlarmApiCallResult.builder().successful(false).build();
} else { } else {
var propagationIds = getPropagationEntityIdsList(alarm);
deleteEntityRelations(tenantId, alarm.getId()); deleteEntityRelations(tenantId, alarm.getId());
alarmDao.removeById(tenantId, alarm.getUuidId()); alarmDao.removeById(tenantId, alarm.getUuidId());
eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId) eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId)
@ -195,7 +196,7 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
if (checkAndDeleteAlarmType) { if (checkAndDeleteAlarmType) {
delAlarmTypes(tenantId, Collections.singleton(alarm.getType())); delAlarmTypes(tenantId, Collections.singleton(alarm.getType()));
} }
return AlarmApiCallResult.builder().alarm(alarm).deleted(true).successful(true).build(); return AlarmApiCallResult.builder().alarm(alarm).deleted(true).successful(true).propagatedEntitiesList(propagationIds).build();
} }
} }