feat:新增：1.删除设备时同时删除该设备的告警 （并删除之前的错误代码）

@@ -18,6 +18,7 @@ import org.thingsboard.rule.engine.api.msg.DeviceCredentialsUpdateNotificationMs
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -38,6 +39,7 @@ 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;
@@ -66,6 +68,8 @@ public class TkDeviceController extends BaseController {
   private final TkDeviceProfileService ytDeviceProfileService;
   private final GatewayNotificationsService gatewayNotificationsService;
   private final TkAlarmInfoService tkAlarmInfoService ;
+  private final AlarmController alarmController;
+
 
 
   @PostMapping
@@ -326,12 +330,25 @@ public class TkDeviceController extends BaseController {
     if(null !=tdIds){
       for (String id : tdIds) {
         deleteTbDevice(id);
-        tkAlarmInfoService.deleteByDeviceId(currentTenantId,id);
+        deleteAlarm(id);
       }
       tkdeviceService.deleteDevices(currentTenantId, deleteDTO.getIds());
     }
   }
 
+  private void deleteAlarm(String id) throws ThingsboardException {
+   List<String> alarmIds = tkAlarmInfoService.getByTbDeviceId(getTenantId().toString(),id);
+   if(alarmIds.isEmpty()){
+     return;
+   }
+    alarmIds.forEach(strAlarmId -> {
+      try {
+        alarmController.deleteAlarm(strAlarmId);
+      } catch (ThingsboardException e) {
+        e.printStackTrace();
+      }
+    });
+  }
   private void deleteTbDevice(String id) throws ThingsboardException {
     DeviceId deviceId = new DeviceId(toUUID(id));
 

@@ -124,8 +124,10 @@ public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
   }
 
   @Override
-  public void deleteByDeviceId(String tenantId, String tbDeviceId) {
-    tkJpaAarmDao.deleteByDeviceId(tenantId,tbDeviceId);
+  public List<String> getByTbDeviceId(String tenantId, String tbDeviceId) {
+    return tkJpaAarmDao.getByTbDeviceId(tenantId,tbDeviceId);
   }
 
+
+
 }

@@ -35,5 +35,5 @@ public interface TkAlarmMapper extends BaseMapper<TkAlarmEntity> {
 
     List<SysDictEntity> alarmType(@Param("tenantId") UUID tenantId);
     List<AggregationDTO> countAlarms(@Param("queryMap") Map<String, Object> queryMap);
-    void deleteByDeviceId(@Param("tenantId") String tenantId, @Param("tbDeviceId") String tbDeviceId);
+    List<String>getByTbDeviceId(@Param("tenantId") String tenantId, @Param("tbDeviceId") String tbDeviceId);
 }

@@ -54,5 +54,5 @@ public interface TkAlarmInfoService {
    */
   List<SysDictDTO> alarmType(TenantId tenantId);
 
-  void deleteByDeviceId(String tenantId, String tbDeviceId);
+  List<String> getByTbDeviceId(String tenantId, String tbDeviceId);
 }

@@ -37,6 +37,8 @@
     </resultMap>
 
 
+
+
     <select id="alarmPage" resultMap="alarmInfo">
         SELECT d.name AS device_name,d.alias AS device_alias,d.id device_id,m.*,d.organization_id,org.name organization_name
         FROM alarm m
@@ -119,14 +121,13 @@
         </where>
         GROUP BY status;
     </select>
-
-    <delete id="deleteByDeviceId">
-        delete from alarm where 1=1
+    <select id="getByTbDeviceId" resultType="java.lang.String">
+        SELECT id  FROM alarm where 1=1
         <if test="tenantId !=null">
             AND tenant_id= #{tenantId}::uuid
         </if>
         <if test="tbDeviceId !=null">
             AND originator_id= #{tbDeviceId}::uuid
         </if>
-    </delete>
+    </select>
 </mapper>