fix:.删除设备时同时删除该设备的告警 bug

chenjunyu_1481036421
1 parent 3e196e3b
Showing 2 changed files with 11 additions and 6 deletions
application/src/main/java/org/thingsboard/server/controller/BaseController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceController.java
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @70d2413
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @70d2413
@@ -580,7 +580,7 @@ public abstract class BaseController {
         }
     }
-    Alarm checkAlarmId(AlarmId alarmId, Operation operation) throws ThingsboardException {
+    protected Alarm checkAlarmId(AlarmId alarmId, Operation operation) throws ThingsboardException {
         try {
             validateId(alarmId, "Incorrect alarmId " + alarmId);
             Alarm alarm = alarmService.findAlarmByIdAsync(getCurrentUser().getTenantId(), alarmId).get();
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceController.java
View file @70d2413
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceController.java
View file @70d2413
@@ -39,13 +39,10 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
-import org.thingsboard.server.controller.AlarmController;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.entities.TkUserCollectEntity;
 import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
-import org.thingsboard.server.dao.yunteng.service.TkUserCollectService;
 import org.thingsboard.server.service.gateway_device.GatewayNotificationsService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
@@ -68,7 +65,6 @@ public class TkDeviceController extends BaseController {
   private final TkDeviceProfileService ytDeviceProfileService;
   private final GatewayNotificationsService gatewayNotificationsService;
   private final TkAlarmInfoService tkAlarmInfoService ;
-  private final AlarmController alarmController;
@@ -337,13 +333,22 @@ public class TkDeviceController extends BaseController {
   }
   private void deleteAlarm(String id) throws ThingsboardException {
+    //根据设备的tbId查询当前设备的所有告警
    List<String> alarmIds = tkAlarmInfoService.getByTbDeviceId(getTenantId().toString(),id);
    if(alarmIds.isEmpty()){
      return;
    }
     alarmIds.forEach(strAlarmId -> {
+      //此处参考AlarmController中的deleteAlarm方法
       try {
-        alarmController.deleteAlarm(strAlarmId);
+        AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
+        Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
+        List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(getTenantId(), alarm.getOriginator());
+        logEntityAction(alarm.getOriginator(), alarm,
+                getCurrentUser().getCustomerId(),
+                ActionType.ALARM_DELETE, null);
+        sendAlarmDeleteNotificationMsg(getTenantId(), alarmId, relatedEdgeIds, alarm);
+        alarmService.deleteAlarm(getTenantId(), alarmId);
       } catch (ThingsboardException e) {
         e.printStackTrace();
       }