feat: 提供通过组织查询告警配置接口

@@ -6,18 +6,17 @@ 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 java.util.List;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
@@ -62,15 +61,16 @@ public class AlarmProfileController extends BaseController {
 
   @PostMapping
   @ApiOperation("新增|编辑")
-  public AlarmProfileDTO saveOrUpdateAlarmProfile(@Validated @RequestBody AlarmProfileDTO alarmProfileDTO)
-      throws ThingsboardException {
+  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) {
+  public boolean deleteAlarmProfile(
+      @Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO) {
     return alarmProfileService.deleteAlarmProFile(deleteDTO);
   }
 
@@ -82,4 +82,12 @@ public class AlarmProfileController extends BaseController {
     return alarmProfileService.updateAlarmProFileStatus(
         alarmProfileId, getCurrentUser().getCurrentTenantId(), status);
   }
+
+  @GetMapping("{organizationId}")
+  @ApiOperation("获取组织下的告警配置")
+  public List<AlarmProfileDTO> findAlarmProfileByOrganizationId(
+      @PathVariable("organizationId") String organizationId) throws ThingsboardException {
+    return alarmProfileService.findAlarmProfileByOrganizationId(
+        organizationId, getCurrentUser().getCurrentTenantId());
+  }
 }

@@ -2,10 +2,11 @@ package org.thingsboard.server.common.data.yunteng.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotEmpty;
-
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class AlarmProfileDTO extends TenantDTO {
   @ApiModelProperty(value = "告警联系人 通知多人“,”号分隔",required = true)
   @NotEmpty(message = "告警联系人不能为空或空字符串")

 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;
@@ -12,21 +11,15 @@ 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.dto.*;
 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.*;
 import java.util.stream.Collectors;
@@ -54,12 +47,12 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
       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);
+              tenantId, new HashSet<>(List.of(organizationId)));
+      if(organizationList.size()==FastIotConstants.MagicNumber.ZERO){
+        throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      }
+      organizationIds =
+          organizationList.stream().map(BaseDTO::getId).distinct().collect(Collectors.toList());
     } else {
       if (!isPtTenantAdmin) {
         organizationIds = userOrganizationMappingService.getOrganizationIdsByUserId(currentUserId);
@@ -125,4 +118,25 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
     }
     return baseMapper.deleteBatchIds(deleteDTO.getIds()) > 0;
   }
+
+  @Override
+  public List<AlarmProfileDTO> findAlarmProfileByOrganizationId(
+      String organizationId, String tenantId) {
+    List<OrganizationDTO> organizationList =
+        ytOrganizationMapper.findOrganizationTreeList(
+            tenantId, new HashSet<>(List.of(organizationId)));
+    if(organizationList.size()==FastIotConstants.MagicNumber.ZERO){
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    Set<String> organizationIds =
+        organizationList.stream().map(BaseDTO::getId).collect(Collectors.toSet());
+    return baseMapper
+        .selectList(
+            new LambdaQueryWrapper<AlarmProfile>()
+                .eq(AlarmProfile::getTenantId, tenantId)
+                .in(AlarmProfile::getOrganizationId, organizationIds))
+        .stream()
+        .map(alarmProfile -> alarmProfile.getDTO(AlarmProfileDTO.class))
+        .collect(Collectors.toList());
+  }
 }

@@ -20,4 +20,6 @@ public interface AlarmProfileService extends BaseService<AlarmProfile> {
   AlarmProfileDTO updateAlarmProFileStatus(String alarmProfileId, String tenantId, Integer status);
 
   boolean deleteAlarmProFile(DeleteDTO deleteDTO);
+
+  List<AlarmProfileDTO> findAlarmProfileByOrganizationId(String organizationId,String tenantId);
 }