fix: 调整告警配置，移除设备配置与告警配置的关系

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.dto.AlarmProfileDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.MailLogDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
+
+import java.util.HashMap;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
+
+@RestController
+@RequestMapping("api/yt/alarm/profile")
+@Api(tags = {"告警配置"})
+@RequiredArgsConstructor
+@PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+public class AlarmProfileController extends BaseController {
+
+  private final AlarmProfileService alarmProfileService;
+
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  @ApiOperation("分页")
+  public YtPageData<AlarmProfileDTO> pageAlarmProfile(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "status", required = false) Integer status,
+      @RequestParam(value = "name", required = false) String name,
+      @RequestParam(value = "organizationId", required = false) String organizationId,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
+
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put("status", status);
+    queryMap.put("name", name);
+    queryMap.put("organizationId", organizationId);
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
+    return alarmProfileService.page(
+        getCurrentUser().isPtTenantAdmin(),
+        getCurrentUser().getCurrentTenantId(),
+        getCurrentUser().getCurrentUserId(),
+        queryMap);
+  }
+
+  @PostMapping
+  @ApiOperation("新增|编辑")
+  public AlarmProfileDTO saveOrUpdateAlarmProfile(@Validated @RequestBody AlarmProfileDTO alarmProfileDTO)
+      throws ThingsboardException {
+    alarmProfileDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return alarmProfileService.saveOrUpdateAlarmProfile(alarmProfileDTO);
+  }
+
+  @DeleteMapping
+  @ApiOperation("删除")
+  public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO) {
+    return alarmProfileService.deleteAlarmProFile(deleteDTO);
+  }
+
+  @GetMapping("{alarmProfileId}/{status}")
+  @ApiOperation("更新状态")
+  public AlarmProfileDTO saveOrUpdateAlarmProfile(
+      @PathVariable("alarmProfileId") String alarmProfileId, @PathVariable("status") Integer status)
+      throws ThingsboardException {
+    return alarmProfileService.updateAlarmProFileStatus(
+        alarmProfileId, getCurrentUser().getCurrentTenantId(), status);
+  }
+}

@@ -4,12 +4,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -33,8 +31,6 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
 import org.thingsboard.server.service.security.permission.Operation;
 
-import java.net.URI;
-import java.sql.ResultSet;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
@@ -65,23 +61,9 @@ public class YtDeviceProfileController extends BaseController {
 
         deviceProfileDTO.setTenantId(getCurrentUser().getCurrentTenantId());
         DeviceProfile tbDeviceProfile = buildTbDeviceProfileFromDeviceProfileDTO(deviceProfileDTO);
-        DeviceProfile savedDeviceProfile = updateTbDeviceProfile(tbDeviceProfile, created);
+        updateTbDeviceProfile(tbDeviceProfile, created);
 
-
-
-
-        DeviceProfileDTO newDeviceProfileDTO = ytDeviceProfileService.insertOrUpdate(savedDeviceProfile.getId().getId().toString(), deviceProfileDTO);
-        return Optional.ofNullable(newDeviceProfileDTO)
-                .map(
-                        dto -> {
-                            URI location =
-                                    ServletUriComponentsBuilder.fromCurrentRequest()
-                                            .path("/{id}")
-                                            .buildAndExpand(newDeviceProfileDTO.getId())
-                                            .toUri();
-                            return ResponseEntity.created(location).body(newDeviceProfileDTO);
-                        })
-                .orElse(ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build());
+        return ResponseEntity.ok(deviceProfileDTO);
     }
 
     /**
@@ -151,7 +133,7 @@ public class YtDeviceProfileController extends BaseController {
     @DeleteMapping
     @ApiOperation("删除")
     public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
-        ytDeviceProfileService.deleteDeviceProfiles(getCurrentUser().getCurrentTenantId(), deleteDTO.getIds());
+        ytDeviceProfileService.checkDeviceProfiles(getCurrentUser().getCurrentTenantId(), deleteDTO.getIds());
 
         for (String id : deleteDTO.getIds()) {
             deleteTbDeviceProfile(id);
@@ -244,11 +226,6 @@ public class YtDeviceProfileController extends BaseController {
                 && deviceProfileDTO.getProfileData().getAlarms() !=null){
             deviceProfileData.setAlarms(deviceProfileDTO.getProfileData().getAlarms());
         }
-//    if (null != deviceProfileDTO.getAlarms()) {
-//      List<DeviceProfileAlarm> list = new ArrayList<>();
-//      DeviceProfileAlarm deviceProfileAlarm =  JacksonUtil.convertValue(deviceProfileDTO.getAlarms(),DeviceProfileAlarm.class);
-//      list.add(deviceProfileAlarm);
-//    }
         tbDeviceProfile.setProfileData(deviceProfileData);
 
         return tbDeviceProfile;

@@ -54,7 +54,7 @@ public enum ErrorMessage {
   EXIST_LEADER_MEMBER_RELATION(400035,"上下级之间有一种关系"),
   FILE_NOT_FOUND(400036,"文件未找到"),
   STORE_FILE_FAILED(400037,"文件存储失败"),
-  NOT_BELONG_CURRENT_TENANT(400038,"该用户不属于当前租户"),
+  NOT_BELONG_CURRENT_TENANT(400038,"不属于当前租户"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

 package org.thingsboard.server.common.data.yunteng.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
+
 @Data
 public class AlarmProfileDTO extends TenantDTO {
-  /** 告警联系人 通知多人“,”号分隔 */
+  @ApiModelProperty(value = "告警联系人 通知多人“,”号分隔",required = true)
+  @NotEmpty(message = "告警联系人不能为空或空字符串")
   private String alarmContactId;
-  /** 设备配置ID */
-  private String deviceProfileId;
-  /** 消息通知方式：多种方式“,”号分隔 MessageTypeEnum */
+
+  @ApiModelProperty(value ="消息通知方式：多种方式“,”号分隔 MessageTypeEnum",required = true)
+  @NotEmpty(message = "消息通知方式不能为空或空字符串")
   private String messageMode;
+
+  @ApiModelProperty(value ="组织ID",required = true)
+  @NotEmpty(message = "组织ID不能为空或空字符串")
+  private String organizationId;
+
+  @ApiModelProperty("状态：0禁用 1启用")
+  private Integer status;
+
+  @ApiModelProperty(value ="告警配置名称",required = true)
+  @NotEmpty(message = "告警配置名称不能为空或空字符串")
+  private String name;
+
+  @ApiModelProperty("告警配置备注")
+  private String remark;
 }

 package org.thingsboard.server.common.data.yunteng.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 
@@ -18,4 +19,7 @@ public class DeleteDTO {
       message = "删除至少需要一个id",
       groups = {DeleteGroup.class})
   private Set<String> ids;
+
+  @ApiModelProperty("租户ID")
+  private String tenantId;
 }

@@ -8,27 +8,23 @@ import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 
 import java.util.List;
 
-/**
- * @Description  场景联动执行动作数据传输表
- * @Author cxy
- * @Date 2021/11/24 17:32
- */
+/** @Description 场景联动执行动作数据传输表 @Author cxy @Date 2021/11/24 17:32 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DoActionDTO  extends  TenantDTO{
+public class DoActionDTO extends TenantDTO {
 
-    @ApiModelProperty(value = "所属设备id")
-    private String deviceId;
+  @ApiModelProperty(value = "所属设备id")
+  private String deviceId;
 
+  @ApiModelProperty(value = "场景联动内容")
+  private JsonNode doContext;
 
+  @ApiModelProperty(value = "输出目标:设备,告警,其他")
+  private ActionTypeEnum outTarget;
 
-    @ApiModelProperty(value = "场景联动内容")
-    private JsonNode doContext;
-
-    @ApiModelProperty(value = "输出目标:设备,场景,其他")
-    private ActionTypeEnum outTarget;
-
-    @ApiModelProperty(value = "场景联动id")
-    private String sceneLinkageId;
+  @ApiModelProperty(value = "场景联动id")
+  private String sceneLinkageId;
 
+  @ApiModelProperty(value = "输出目标为告警才进行配置")
+  private String alarmProfileId;
 }

@@ -12,6 +12,10 @@ public class AlarmProfile extends TenantBaseEntity {
 
   private static final long serialVersionUID = -4922707705163155569L;
   private String alarmContactId;
-  private String deviceProfileId;
+  private String organizationId;
   private String messageMode;
+  private Integer status;
+  private String name;
+  private String remark;
+
 }

@@ -10,27 +10,24 @@ import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 
-/**
- * @Description 执行动作 @Author cxy @Date 2021/11/24 17:24
- */
+/** @Description 执行动作 @Author cxy @Date 2021/11/24 17:24 */
 @Data
 @TableName(value = ModelConstants.Table.IOTFS_DO_ACTION_TABLE_NAME, autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 public class DoAction extends TenantBaseEntity {
 
-    private static final long serialVersionUID = -5459834451418047957L;
+  private static final long serialVersionUID = -5459834451418047957L;
 
-    private String deviceId;
-    @TableField(typeHandler = EnumTypeHandler.class)
-    private ActionTypeEnum outTarget;
-    /**
-     * 场景联动内容
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JsonNode doContext;
+  private String deviceId;
 
-    /**
-     * 场景联动id
-     */
-    private String sceneLinkageId;
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private ActionTypeEnum outTarget;
+  /** 场景联动内容 */
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode doContext;
+
+  /** 场景联动id */
+  private String sceneLinkageId;
+
+  private String alarmProfileId;
 }

 package org.thingsboard.server.dao.yunteng.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.NoneTenantAssetException;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmProfileDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
+import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
+import org.thingsboard.server.common.data.yunteng.enums.RoleEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.AlarmProfile;
+import org.thingsboard.server.dao.yunteng.entities.Role;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmProfileMapper;
+import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
+import org.thingsboard.server.dao.yunteng.service.DoActionService;
+import org.thingsboard.server.dao.yunteng.service.YtOrganizationService;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMapper, AlarmProfile>
     implements AlarmProfileService {
+
+  private final DoActionService doActionService;
+
+  private final UserOrganizationMappingServiceImpl userOrganizationMappingService;
+
+  private final OrganizationMapper ytOrganizationMapper;
+
+  @Override
+  public YtPageData<AlarmProfileDTO> page(
+      boolean isPtTenantAdmin,
+      String tenantId,
+      String currentUserId,
+      Map<String, Object> queryMap) {
+    List<String> organizationIds = null;
+    if (null != queryMap.get("organizationId")) {
+      String organizationId = (String) queryMap.get("organizationId");
+      List<OrganizationDTO> organizationList =
+          ytOrganizationMapper.findOrganizationTreeList(
+              tenantId, new HashSet<>(Arrays.asList(organizationId)));
+      Set<String> ids =
+          organizationList.stream()
+              .map(organizationDTO -> organizationDTO.getId())
+              .collect(Collectors.toSet());
+      organizationIds = new ArrayList<>(ids);
+    } else {
+      if (!isPtTenantAdmin) {
+        organizationIds = userOrganizationMappingService.getOrganizationIdsByUserId(currentUserId);
+      }
+    }
+    IPage<AlarmProfile> alarmProfileIPage =
+        baseMapper.selectPage(
+            getPage(queryMap, "create_time", false),
+            new QueryWrapper<AlarmProfile>()
+                .lambda()
+                .eq(queryMap.get("status") != null, AlarmProfile::getStatus, queryMap.get("status"))
+                .eq(AlarmProfile::getTenantId, tenantId)
+                .in(organizationIds != null, AlarmProfile::getOrganizationId, organizationIds)
+                .like(
+                    queryMap.get("name") != null,
+                    AlarmProfile::getName,
+                    String.valueOf(queryMap.get("name"))));
+    return getPageData(alarmProfileIPage, AlarmProfileDTO.class);
+  }
+
   @Override
   public List<AlarmProfileDTO> findAlarmProfilesByContactId(String contactId, String tenantId) {
     return ReflectUtils.sourceToTarget(
@@ -27,4 +89,47 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
                 .like(AlarmProfile::getAlarmContactId, contactId)),
         AlarmProfileDTO.class);
   }
+
+  @Override
+  @Transactional
+  public AlarmProfileDTO saveOrUpdateAlarmProfile(AlarmProfileDTO alarmProfileDTO) {
+    if (StringUtils.isNotEmpty(alarmProfileDTO.getId())) {
+      AlarmProfile alarmProfile = baseMapper.selectById(alarmProfileDTO.getId());
+      if (null == alarmProfile) {
+        throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
+      }
+      baseMapper.updateById(alarmProfileDTO.getEntity(AlarmProfile.class));
+    } else {
+      baseMapper.insert(alarmProfileDTO.getEntity(AlarmProfile.class));
+    }
+    return alarmProfileDTO;
+  }
+
+  @Override
+  @Transactional
+  public AlarmProfileDTO updateAlarmProFileStatus(
+      String alarmProfileId, String tenantId, Integer status) {
+    AlarmProfile alarmProfile = baseMapper.selectById(alarmProfileId);
+    if (null == alarmProfile) {
+      throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
+    }
+    if (!alarmProfile.getTenantId().equals(tenantId)) {
+      throw new NoneTenantAssetException(ErrorMessage.NOT_BELONG_CURRENT_TENANT);
+    }
+    alarmProfile.setStatus(status);
+    baseMapper.updateById(alarmProfile);
+    return alarmProfile.getDTO(AlarmProfileDTO.class);
+  }
+
+  @Override
+  @Transactional
+  public boolean deleteAlarmProFile(DeleteDTO deleteDTO) {
+    // 如果有场景联动使用告警配置，则不能删除
+    List<DoActionDTO> list =
+        doActionService.findDoActionByAlarmProfileIds(deleteDTO.getTenantId(), deleteDTO.getIds());
+    if (list.size() > FastIotConstants.MagicNumber.ZERO) {
+      throw new YtDataValidationException(ErrorMessage.EXIST_LEADER_MEMBER_RELATION.getMessage());
+    }
+    return baseMapper.deleteBatchIds(deleteDTO.getIds()) > 0;
+  }
 }

 package org.thingsboard.server.dao.yunteng.impl;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cglib.core.ReflectUtils;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
 import org.thingsboard.server.dao.yunteng.entities.DoAction;
+import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.mapper.DoActionMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.DoActionService;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
-/**
- * @Description
- * @Author cxy
- * @Date 2021/12/6 20:23
- */
+/** @Description @Author cxy @Date 2021/12/6 20:23 */
 @Service
 @RequiredArgsConstructor
 public class DoActionServiceImpl extends AbstractBaseService<DoActionMapper, DoAction>
-        implements DoActionService {
-    private final DoActionMapper actionMapper;
-    @Override
-    public List<DoAction> getActions(String sceneId) {
-        LambdaQueryWrapper filter = new QueryWrapper<DoAction>().lambda()
-                .eq(DoAction::getSceneLinkageId,sceneId);
-        return actionMapper.selectList(filter);
-    }
+    implements DoActionService {
+  @Override
+  public List<DoAction> getActions(String sceneId) {
+    LambdaQueryWrapper filter =
+        new QueryWrapper<DoAction>().lambda().eq(DoAction::getSceneLinkageId, sceneId);
+    return baseMapper.selectList(filter);
+  }
 
+  @Override
+  public List<DoActionDTO> findDoActionByAlarmProfileIds(
+      String tenantId, Set<String> alarmProfileIds) {
+    List<DoAction> doActions =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<DoAction>()
+                .eq(TenantBaseEntity::getTenantId, tenantId)
+                .in(DoAction::getAlarmProfileId, alarmProfileIds));
+    return doActions.stream()
+        .map(doAction -> doAction.getDTO(DoActionDTO.class))
+        .collect(Collectors.toList());
+  }
 }

@@ -21,10 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmContactService;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -165,7 +162,7 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
         String organizationId = (String) queryMap.get("organizationId");
         queryMap.put("tenantId", tenantId);
         if (StringUtils.isNotEmpty(organizationId)) {
-            List<String> ids = new ArrayList<>();
+            Set<String> ids = new HashSet<>();
             ids.add(organizationId);
             // 查询该组织的所有子类
             List<OrganizationDTO> organizationDTOS =

@@ -35,158 +35,76 @@ import java.util.*;
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class YtDeviceProfileServiceImpl
-        implements YtDeviceProfileService {
-
-    private final DeviceMapper deviceMapper;
-    private final AlarmProfileMapper alarmProfileMapper;
-    private final CacheUtils cacheUtils;
-
-    private final YtJpaDeviceProfileDao deviceProfileDao;
-
-    @Override
-    @Transactional
-    public DeviceProfileDTO insertOrUpdate(String deviceProfileId, DeviceProfileDTO deviceProfileDTO) {
-        if (StringUtils.isBlank(deviceProfileDTO.getId())) {
-            return insert(deviceProfileId, deviceProfileDTO);
-        } else {
-            return update(deviceProfileDTO);
-        }
-    }
-
-    private DeviceProfileDTO update(DeviceProfileDTO deviceProfileDTO) {
-
-        // 如果原来不是TCP或者更新也不是TCP 那就需要check
-//    if (!deviceProfile.getTransportType().equals(TransportTypeEnum.TCP)
-//        || !deviceProfileDTO.getTransportType().equals(TransportTypeEnum.TCP)) {
-//      checkDeviceProfile(deviceProfileDTO, deviceProfile);
-//    }
-        LambdaQueryWrapper<AlarmProfile> filter = new QueryWrapper<AlarmProfile>().lambda()
-                .eq(AlarmProfile::getTenantId, deviceProfileDTO.getTenantId())
-                .eq(AlarmProfile::getDeviceProfileId, deviceProfileDTO.getId());
-        List<AlarmProfile> oldAlarms = alarmProfileMapper.selectList(filter);
-        List<String> oldIds = new ArrayList<>();
-        for (AlarmProfile item : oldAlarms) {
-            oldIds.add(item.getId());
-        }
-
-
-        Optional.ofNullable(deviceProfileDTO.getAlarmProfile())
-//        .filter(alarmProfileDTO -> StringUtils.isNotBlank(alarmProfileDTO.getId()))
-                .ifPresent(alarmProfileDTO -> {
-                    AlarmProfile alarmProfile = buildAlarmDto2Entity(deviceProfileDTO.getId(), deviceProfileDTO.getTenantId(), alarmProfileDTO);
-                    String alarmId = alarmProfileDTO.getId();
-                    if (StringUtils.isNotBlank(alarmId)) {
-                        alarmProfileMapper.updateById(alarmProfile);
-                        oldIds.remove(alarmId);
-                    }
-                    {
-                        alarmProfileMapper.insert(alarmProfile);
-                    }
-                });
-        if(!oldIds.isEmpty()){
-            alarmProfileMapper.deleteBatchIds(oldIds);
-        }
-        return deviceProfileDTO;
+public class YtDeviceProfileServiceImpl implements YtDeviceProfileService {
+
+  private final DeviceMapper deviceMapper;
+
+  private final YtJpaDeviceProfileDao deviceProfileDao;
+
+  @Override
+  public boolean validateFormdata(DeviceProfileDTO ytDeviceProfileDTO) {
+    TenantId tenantId = new TenantId(UUID.fromString(ytDeviceProfileDTO.getTenantId()));
+    if (StringUtils.isBlank(ytDeviceProfileDTO.getId())) {
+      // 判断数据库是否已存在名字相同的设备配置
+
+      DeviceProfile profile = deviceProfileDao.findByName(tenantId, ytDeviceProfileDTO.getName());
+      if (profile != null) {
+        throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
+      }
+    } else {
+      UUID profileId = UUID.fromString(ytDeviceProfileDTO.getId());
+      DeviceProfile profile = deviceProfileDao.findById(tenantId, profileId);
+      if (profile == null) {
+        throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+      }
     }
 
-    private DeviceProfileDTO insert(String deviceProfileId, DeviceProfileDTO deviceProfileDTO) {
-        Optional.ofNullable(deviceProfileDTO.getAlarmProfile())
-                .map(
-                        alarmProfileDTO -> {
-                            AlarmProfile alarmProfile = buildAlarmDto2Entity(deviceProfileId, deviceProfileDTO.getTenantId(), alarmProfileDTO);
-                            alarmProfileMapper.insert(alarmProfile);
-                            alarmProfile.copyToDTO(alarmProfileDTO);
-                            return alarmProfileDTO;
-                        });
-        return deviceProfileDTO;
+    return false;
+  }
+
+  @Override
+  @Transactional
+  public void checkDeviceProfiles(String tenantId, Set<String> ids) {
+    // check if ids bind to device
+    int count =
+        deviceMapper.selectCount(
+            new QueryWrapper<YtDevice>().lambda().in(YtDevice::getProfileId, ids));
+    if (count > 0) {
+      throw new YtDataValidationException("有设备使用待删除配置，请先删除设备或者修改设备配置");
     }
-
-    @NotNull
-    private AlarmProfile buildAlarmDto2Entity(String deviceProfileId, String tenantId, AlarmProfileDTO alarmProfileDTO) {
-        alarmProfileDTO.setDeviceProfileId(deviceProfileId);
-        alarmProfileDTO.setTenantId(tenantId);
-        AlarmProfile alarmProfile = new AlarmProfile();
-        alarmProfileDTO.copyToEntity(alarmProfile, ModelConstants.TablePropertyMapping.UPDATE_TIME,
-                ModelConstants.TablePropertyMapping.UPDATER);
-        return alarmProfile;
-    }
-
-    @Override
-    public boolean validateFormdata(DeviceProfileDTO ytDeviceProfileDTO) {
-        TenantId tenantId = new TenantId(UUID.fromString(ytDeviceProfileDTO.getTenantId()));
-        if (StringUtils.isBlank(ytDeviceProfileDTO.getId())) {
-            // 判断数据库是否已存在名字相同的设备配置
-
-            DeviceProfile profile = deviceProfileDao.findByName(tenantId, ytDeviceProfileDTO.getName());
-            if (profile != null) {
-                throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
-            }
-        } else {
-            UUID profileId = UUID.fromString(ytDeviceProfileDTO.getId());
-            DeviceProfile profile = deviceProfileDao.findById(tenantId, profileId);
-            if (profile == null) {
-                throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    @Transactional
-    public void deleteDeviceProfiles(String tenantId, Set<String> ids) {
-        // check if ids bind to device
-        int count =
-                deviceMapper.selectCount(new QueryWrapper<YtDevice>().lambda().in(YtDevice::getProfileId, ids));
-        if (count > 0) {
-            throw new YtDataValidationException("有设备使用待删除配置，请先删除设备或者修改设备配置");
-        }
-
-        for (String id : ids) {
-            Validator.validateId(UUID.fromString(id),"Incorrect device profile id to deal.");
-            LambdaQueryWrapper filter = new LambdaQueryWrapper<AlarmProfile>()
-                    .eq(AlarmProfile::getTenantId, tenantId)
-                    .in(AlarmProfile::getDeviceProfileId, id);
-            alarmProfileMapper.delete(filter);
-        }
-
-    }
-
-    @Override
-    public Optional<DeviceProfileDTO> getDeviceProfile(String tenantId, String id) {
-        TenantId tenant = new TenantId(UUID.fromString(tenantId));
-        DeviceProfile profile = deviceProfileDao.findById(tenant, UUID.fromString(id));
-        return Optional.ofNullable(profile).map(entity -> {
-            DeviceProfileDTO result = ReflectUtils.getDeviceProfileDTO(entity);
-            AlarmProfile alarmProfile = alarmProfileMapper.selectOne(new QueryWrapper<AlarmProfile>().lambda().eq(AlarmProfile::getDeviceProfileId, result.getId()));
-            Optional.ofNullable(alarmProfile).ifPresent(alarmProfile1 -> {
-                AlarmProfileDTO alarmProfileDTO = new AlarmProfileDTO();
-                BeanUtils.copyProperties(alarmProfile, alarmProfileDTO);
-                result.setAlarmProfile(alarmProfileDTO);
+  }
+
+  @Override
+  public Optional<DeviceProfileDTO> getDeviceProfile(String tenantId, String id) {
+    TenantId tenant = new TenantId(UUID.fromString(tenantId));
+    DeviceProfile profile = deviceProfileDao.findById(tenant, UUID.fromString(id));
+    return Optional.ofNullable(profile)
+        .map(
+            entity -> {
+              DeviceProfileDTO result = ReflectUtils.getDeviceProfileDTO(entity);
+              return result;
             });
-
-            return result;
-        });
-    }
-
-    @Override
-    public YtPageData<DeviceProfileDTO> page(PageLink pageLink, String tenantIdStr, String transportType) {
-
-
-        TenantId tenantId = new TenantId(UUID.fromString(tenantIdStr));
-        Validator.validatePageLink(pageLink);
-        PageData<DeviceProfileDTO> tbDatas = deviceProfileDao.findDeviceProfileInfos(pageLink, tenantId, transportType);
-        YtPageData<DeviceProfileDTO> result = new YtPageData<>(tbDatas.getData(), tbDatas.getTotalElements());
-
-        return result;
-    }
-
-
-    @Override
-    public List<DeviceProfileDTO> findDeviceProfile(String tenantId) {
-        UUID profileId = UUID.fromString(tenantId);
-        List<DeviceProfileDTO> results = deviceProfileDao.findDeviceProfileByTenantId(new TenantId(profileId));
-        return results;
-    }
+  }
+
+  @Override
+  public YtPageData<DeviceProfileDTO> page(
+      PageLink pageLink, String tenantIdStr, String transportType) {
+
+    TenantId tenantId = new TenantId(UUID.fromString(tenantIdStr));
+    Validator.validatePageLink(pageLink);
+    PageData<DeviceProfileDTO> tbDatas =
+        deviceProfileDao.findDeviceProfileInfos(pageLink, tenantId, transportType);
+    YtPageData<DeviceProfileDTO> result =
+        new YtPageData<>(tbDatas.getData(), tbDatas.getTotalElements());
+
+    return result;
+  }
+
+  @Override
+  public List<DeviceProfileDTO> findDeviceProfile(String tenantId) {
+    UUID profileId = UUID.fromString(tenantId);
+    List<DeviceProfileDTO> results =
+        deviceProfileDao.findDeviceProfileByTenantId(new TenantId(profileId));
+    return results;
+  }
 }

@@ -69,8 +69,9 @@ public class YtNoticeServiceImpl implements YtNoticeService {
         Organization organization = organizationMapper.selectOne(organizationQueryWrapper);
 
         QueryWrapper<AlarmProfile> alarmProfileQueryWrapper = new QueryWrapper<AlarmProfile>();
-        alarmProfileQueryWrapper.lambda()
-                .eq(AlarmProfile::getDeviceProfileId, device.getProfileId());
+        //TODO junlianglee 修改通知
+//        alarmProfileQueryWrapper.lambda()
+//                .eq(AlarmProfile::getDeviceProfileId, device.getProfileId());
         AlarmProfile alarmProfile = alarmProfileMapper.selectOne(alarmProfileQueryWrapper);
 
 

 package org.thingsboard.server.dao.yunteng.service;
 
 import org.thingsboard.server.common.data.yunteng.dto.AlarmProfileDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.AlarmProfile;
 
 import java.util.List;
+import java.util.Map;
 
 public interface AlarmProfileService extends BaseService<AlarmProfile> {
+
+  YtPageData<AlarmProfileDTO> page(
+      boolean isPtTenantAdmin, String tenantId, String currentUserId, Map<String, Object> queryMap);
+
   List<AlarmProfileDTO> findAlarmProfilesByContactId(String contactId, String tenantId);
+
+  AlarmProfileDTO saveOrUpdateAlarmProfile(AlarmProfileDTO alarmProfileDTO);
+
+  AlarmProfileDTO updateAlarmProFileStatus(String alarmProfileId, String tenantId, Integer status);
+
+  boolean deleteAlarmProFile(DeleteDTO deleteDTO);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
 import org.thingsboard.server.dao.yunteng.entities.DoAction;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @Description
@@ -14,4 +14,6 @@ import java.util.List;
 public interface DoActionService extends BaseService<DoAction>{
 
     List<DoAction> getActions(String sceneId);
+
+    List<DoActionDTO> findDoActionByAlarmProfileIds(String tenantId, Set<String> alarmProfileIds);
 }

@@ -9,9 +9,8 @@ import java.util.Optional;
 import java.util.Set;
 
 public interface YtDeviceProfileService {
-    DeviceProfileDTO insertOrUpdate(String deviceProfileId, DeviceProfileDTO deviceProfileDTO);
 
-    void deleteDeviceProfiles(String tenantId, Set<String> ids);
+    void checkDeviceProfiles(String tenantId, Set<String> ids);
 
     Optional<DeviceProfileDTO> getDeviceProfile(String tenantId, String id);
 

@@ -8,6 +8,7 @@
         <result property="doContext" column="do_context" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="outTarget" column="out_target" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>
+        <result property="alarmProfileId" column="alarm_profile_id"/>
         <result property="description" column="description"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="updater" column="updater"/>