fix: 下级组织在进行新增编辑时,将该组织及上级组织的缓存设置为无效

@@ -6,15 +6,13 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 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.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
 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.dto.DeleteDTO;
@@ -39,10 +37,9 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
   private final DeviceMapper deviceMapper;
   private final SceneLinkageMapper sceneMapper;
   private final AlarmContactMapper contactMapper;
+  private final String cacheName = FastIotConstants.CacheConfigKey.ORGANIZATION;
+  private final CacheUtils cacheUtils;
 
-  @Caching(evict= {
-          @CacheEvict(cacheNames = FastIotConstants.CacheConfigKey.ORGANIZATION, key = "{#tenantId, #organizationDTO.id}")
-  })
   @Override
   @Transactional
   public OrganizationDTO saveOrganization(
@@ -97,6 +94,7 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
           currentUserOrganization.toArray(new String[currentUserOrganization.size()]));
     }
     organization.copyToDTO(organizationDTO);
+    invalidateParentAndMeCacheByTenantIdAndId(tenantId,true,null,organization.getId());
     return organizationDTO;
   }
 
@@ -197,6 +195,7 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     organization.setName(organizationDTO.getName());
     organization.setRemark(organizationDTO.getRemark());
     organization.setSort(organizationDTO.getSort());
+    String sourceParentOrganizationId = organization.getParentId();
     if (parent != null) {
       organization.setParentId(parent.getId());
     } else {
@@ -204,6 +203,10 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     }
     baseMapper.updateById(organization);
     organization.copyToDTO(organizationDTO);
+    //父级组织有变化才更新
+    if(!organizationDTO.getParentId().equals(sourceParentOrganizationId)){
+      invalidateParentAndMeCacheByTenantIdAndId(tenantId,false,organizationDTO.getParentId(),organization.getId());
+    }
     return organizationDTO;
   }
 
@@ -357,22 +360,26 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
    * @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 =
-            findOrganizationTreeList(tenantId,null, organizationIds);
-    List<String> queryOrganizationIds = new ArrayList<>();
-    organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
-    return queryOrganizationIds;
+    String key = tenantId + "_" + organizationId;
+    Optional<List<String>> allIds = cacheUtils.get(cacheName,key);
+    return allIds.orElseGet(()->{
+      List<String> organizationIds = new ArrayList<>();
+      if (StringUtils.isEmpty(organizationId)) {
+        return organizationIds;
+      }
+      if (!StringUtils.isEmpty(organizationId)) {
+        organizationIds.add(organizationId);
+      }
+      // 查询该组织的所有子类
+      List<OrganizationDTO> organizationDTOS =
+              findOrganizationTreeList(tenantId,null, organizationIds);
+      List<String> queryOrganizationIds = new ArrayList<>();
+      organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
+      cacheUtils.put(cacheName,key,queryOrganizationIds);
+      return queryOrganizationIds;
+    });
   }
 
   @Override
@@ -383,4 +390,18 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     return baseMapper.findOrganizationTreeList(tenantId,sort.toString(), organizationIds);
   }
 
+  @Override
+  public void invalidateParentAndMeCacheByTenantIdAndId(String tenantId, boolean isAdd, String sourceParentOrganizationId,
+         String targetOrganizationId) {
+    if(!isAdd && StringUtils.isNotEmpty(sourceParentOrganizationId)){
+      //原组织缓存
+      List<OrganizationDTO> sourceParentOrganizationIds =
+              findOrganizationTreeList(tenantId,OrganizationEnum.UP,List.of(sourceParentOrganizationId));
+      sourceParentOrganizationIds.forEach(org->cacheUtils.invalidate(cacheName,tenantId + "_" + org.getId()));
+    }
+    //目标组织缓存
+    List<OrganizationDTO> targetOrganizationIds =
+            findOrganizationTreeList(tenantId,OrganizationEnum.UP,List.of(targetOrganizationId));
+    targetOrganizationIds.forEach(org->cacheUtils.invalidate(cacheName,tenantId + "_" + org.getId()));
+  }
 }

@@ -33,4 +33,14 @@ public interface TkOrganizationService extends BaseService<TkOrganizationEntity>
   List<String> organizationAllIds(String tenantId, String organizationId);
 
   List<OrganizationDTO> findOrganizationTreeList(String tenantId, OrganizationEnum sort, Collection<String> organizationIds);
+
+  /**
+   * 如果是更新且上级组织变化了将原组织的上级组织的缓存设置为无效
+   * 如果是新增将目标组织及上级组织的缓存设置为无效
+   * @param tenantId 租户ID
+   * @param sourceParentOrganizationId 原父组织ID
+   * @param targetOrganizationId 目标组织ID
+   */
+  void invalidateParentAndMeCacheByTenantIdAndId(String tenantId,boolean isAdd, String sourceParentOrganizationId,
+                                                 String targetOrganizationId);
 }