refactor: 调整组织结构下所有组织的接口实现

1、缓存组织信息

@@ -32,10 +32,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.device.DeviceProfileDao;
 import org.thingsboard.server.dao.device.DeviceProfileDao;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
-import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.*;
 
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.*;
@@ -50,7 +47,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   private final DeviceProfileDao deviceProfileDao;
   private final DeviceProfileDao deviceProfileDao;
   private final TkDeviceProfileMapper tkProfileMapper;
   private final TkDeviceProfileMapper tkProfileMapper;
 
 
-  private final OrganizationMapper tkOrganizationMapper;
+  private final TkOrganizationService organizationService;
   private final SceneLinkageMapper sceneLinkageMapper;
   private final SceneLinkageMapper sceneLinkageMapper;
   private final TriggerMapper triggerMapper;
   private final TriggerMapper triggerMapper;
   private final DoConditionMapper conditionMapper;
   private final DoConditionMapper conditionMapper;
@@ -133,8 +130,8 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     TenantId id = TenantId.fromUUID(UUID.fromString(deviceTenantId));
     TenantId id = TenantId.fromUUID(UUID.fromString(deviceTenantId));
     DeviceProfile deviceProfile =
     DeviceProfile deviceProfile =
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
-    TkOrganizationEntity organization =
-        tkOrganizationMapper.selectById(deviceDTO.getOrganizationId());
+    OrganizationDTO organization =
+            organizationService.findOrganizationById(deviceTenantId,deviceDTO.getOrganizationId());
     if (null == deviceProfile || null == organization) {
     if (null == deviceProfile || null == organization) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
@@ -274,7 +271,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
       String organizationId,
       String organizationId,
       String deviceLabel,
       String deviceLabel,
       String deviceProfileId) {
       String deviceProfileId) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     if (orgIds.isEmpty()) {
     if (orgIds.isEmpty()) {
       throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
       throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
     }
     }
@@ -294,7 +291,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @Override
   @Override
   public List<DeviceDTO> findDevicesByTransportTypeAndOrganizationId(
   public List<DeviceDTO> findDevicesByTransportTypeAndOrganizationId(
       String tenantId, String organizationId, DeviceTransportType transportType) {
       String tenantId, String organizationId, DeviceTransportType transportType) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     if (orgIds.isEmpty()) {
     if (orgIds.isEmpty()) {
       throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
       throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
     }
     }
@@ -380,7 +377,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     String convertConfigId =
     String convertConfigId =
         Optional.ofNullable(queryMap.get("convertConfigId")).map(Object::toString).orElse(null);
         Optional.ofNullable(queryMap.get("convertConfigId")).map(Object::toString).orElse(null);
     if (!StringUtils.isEmpty(organizationId)) {
     if (!StringUtils.isEmpty(organizationId)) {
-      List<String> queryOrganizationIds = organizationAllIds(tenantId, organizationId);
+      List<String> queryOrganizationIds = organizationService.organizationAllIds(tenantId, organizationId);
       queryMap.put("organizationIds", queryOrganizationIds);
       queryMap.put("organizationIds", queryOrganizationIds);
     }
     }
     // 用于数据流转已选,待选过滤============开始
     // 用于数据流转已选,待选过滤============开始
@@ -415,28 +412,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     return new TkPageData<>(records, deviceIPage.getTotal());
     return new TkPageData<>(records, deviceIPage.getTotal());
   }
   }
 
 
-  /**
-   * 组织结构下的所有组织ID
-   *
-   * @param tenantId 租户ID
-   * @param organizationId 组织ID
-   */
-  @NotNull
-  private List<String> organizationAllIds(String tenantId, String organizationId) {
-    List<String> organizationIds = new ArrayList<>();
-    if (StringUtils.isEmpty(organizationId)) {
-      return organizationIds;
-    }
-    if (!StringUtils.isEmpty(organizationId)) {
-      organizationIds.add(organizationId);
-    }
-    // 查询该组织的所有子类
-    List<OrganizationDTO> organizationDTOS =
-        tkOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
-    List<String> queryOrganizationIds = new ArrayList<>();
-    organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
-    return queryOrganizationIds;
-  }
+
 
 
   @Override
   @Override
   public TkPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
   public TkPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
@@ -555,14 +531,14 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @Override
   @Override
   public List<SelectItemDTO> findMasterDevices(
   public List<SelectItemDTO> findMasterDevices(
       String tenantId, String customerId, String organizationId, String deviceProfileId) {
       String tenantId, String customerId, String organizationId, String deviceProfileId) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     return baseMapper.masterDevices(customerId, tenantId, orgIds, deviceProfileId);
     return baseMapper.masterDevices(customerId, tenantId, orgIds, deviceProfileId);
   }
   }
 
 
   @Override
   @Override
   public List<SelectItemDTO> findSlaveDevices(
   public List<SelectItemDTO> findSlaveDevices(
       String masterId, String tenantId, String customerId, String organizationId) {
       String masterId, String tenantId, String customerId, String organizationId) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     return baseMapper.slaveDevices(customerId, tenantId, orgIds, masterId);
     return baseMapper.slaveDevices(customerId, tenantId, orgIds, masterId);
   }
   }
 
 
@@ -574,7 +550,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @Override
   @Override
   public List<String> findDeviceKeys(
   public List<String> findDeviceKeys(
       String tenantId, String customerId, String organizationId, List<String> deviceIds) {
       String tenantId, String customerId, String organizationId, List<String> deviceIds) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     return baseMapper.findDeviceKeys(tenantId, customerId, orgIds, deviceIds);
     return baseMapper.findDeviceKeys(tenantId, customerId, orgIds, deviceIds);
   }
   }
 
 
@@ -688,7 +664,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
 
   @Override
   @Override
   public List<String> rpcDevices(String tenantId, String organizationId, String projectId) {
   public List<String> rpcDevices(String tenantId, String organizationId, String projectId) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
 
 
     List<TkDeviceEntity> organizationDevices =
     List<TkDeviceEntity> organizationDevices =
         baseMapper.selectList(
         baseMapper.selectList(

@@ -6,15 +6,22 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.Assert;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tree.TreeUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tree.TreeUtils;
+import org.thingsboard.server.dao.cache.EntitiesCacheManager;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -23,6 +30,8 @@ import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
+import static org.thingsboard.server.common.data.CacheConstants.DEVICE_CACHE;
+
 @Service
 @Service
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationMapper, TkOrganizationEntity>
 public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationMapper, TkOrganizationEntity>
@@ -34,6 +43,9 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
   private final SceneLinkageMapper sceneMapper;
   private final SceneLinkageMapper sceneMapper;
   private final AlarmContactMapper contactMapper;
   private final AlarmContactMapper contactMapper;
 
 
+  @Caching(evict= {
+          @CacheEvict(cacheNames = FastIotConstants.CacheConfigKey.ORGANIZATION, key = "{#tenantId, #organizationDTO.id}")
+  })
   @Override
   @Override
   @Transactional
   @Transactional
   public OrganizationDTO saveOrganization(
   public OrganizationDTO saveOrganization(
@@ -148,7 +160,9 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
             .lambda()
             .lambda()
             .in(TkUserOrganizationMappingEntity::getOrganizationId, organizationIds));
             .in(TkUserOrganizationMappingEntity::getOrganizationId, organizationIds));
   }
   }
-
+  @Caching(evict= {
+          @CacheEvict(cacheNames = FastIotConstants.CacheConfigKey.ORGANIZATION, key = "{#tenantId, #organizationDTO.id}")
+  })
   @Override
   @Override
   @Transactional
   @Transactional
   public OrganizationDTO updateOrganization(
   public OrganizationDTO updateOrganization(
@@ -339,4 +353,30 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     }
     }
     return organization.getDTO(OrganizationDTO.class);
     return organization.getDTO(OrganizationDTO.class);
   }
   }
+
+
+  /**
+   * 组织结构下的所有组织ID
+   *
+   * @param tenantId 租户ID
+   * @param organizationId 组织ID
+   */
+  @Cacheable(cacheNames = FastIotConstants.CacheConfigKey.ORGANIZATION, key = "{#tenantId, #organizationId}")
+  @Override
+  public List<String> organizationAllIds(String tenantId, String organizationId) {
+    List<String> organizationIds = new ArrayList<>();
+    if (StringUtils.isEmpty(organizationId)) {
+      return organizationIds;
+    }
+    if (!StringUtils.isEmpty(organizationId)) {
+      organizationIds.add(organizationId);
+    }
+    // 查询该组织的所有子类
+    List<OrganizationDTO> organizationDTOS =
+            baseMapper.findOrganizationTreeList(tenantId, organizationIds);
+    List<String> queryOrganizationIds = new ArrayList<>();
+    organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
+    return queryOrganizationIds;
+  }
+
 }
 }

@@ -21,4 +21,12 @@ public interface TkOrganizationService extends BaseService<TkOrganizationEntity>
   void unBindUserToOrganization(Set<String> userIds);
   void unBindUserToOrganization(Set<String> userIds);
 
 
   OrganizationDTO findOrganizationById(String id,String tenantId);
   OrganizationDTO findOrganizationById(String id,String tenantId);
+
+  /**
+   * 组织结构下的所有组织ID
+   *
+   * @param tenantId 租户ID
+   * @param organizationId 组织ID
+   */
+  List<String> organizationAllIds(String tenantId, String organizationId);
 }
 }