diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/utils/RedisUtils.java b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/utils/RedisUtils.java index c17c94b0..b2a899e3 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/utils/RedisUtils.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/utils/RedisUtils.java @@ -34,26 +34,11 @@ public class RedisUtils { * @return keys */ public static Set scanKeys(String match) { - // TODO TEST return scanKeys(ScanOptions.scanOptions() .match(match) .build()); } - /** - * 扫描 key - * - * @param match 匹配值 - * @param count 数量 - * @return keys - */ - public static Set scanKeys(String match, int count) { - return scanKeys(ScanOptions.scanOptions() - .match(match) - .count(count) - .build()); - } - /** * 扫描 key * diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/FavoriteApiImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/FavoriteApiImpl.java index 2ee066a6..29d26a02 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/FavoriteApiImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/FavoriteApiImpl.java @@ -94,15 +94,27 @@ public class FavoriteApiImpl implements FavoriteApi { @Override @Async("asyncExecutor") public void deleteFavoriteByUserId(Long userId) { + if (userId == null) { + return; + } + // 删除缓存 List favoriteKeyList = Arrays.stream(FavoriteTypeEnum.values()) .map(s -> FavoriteCacheKeyDefine.FAVORITE.format(s, userId)) .collect(Collectors.toList()); redisTemplate.delete(favoriteKeyList); + // 删除库 + FavoriteQueryRequest request = new FavoriteQueryRequest(); + request.setUserId(userId); + favoriteService.deleteFavorite(request); } @Override @Async("asyncExecutor") public void deleteFavoriteByUserIdList(List userIdList) { + if (Lists.isEmpty(userIdList)) { + return; + } + // 删除缓存 List favoriteKeyList = new ArrayList<>(); for (Long userId : userIdList) { Arrays.stream(FavoriteTypeEnum.values()) @@ -110,11 +122,18 @@ public class FavoriteApiImpl implements FavoriteApi { .forEach(favoriteKeyList::add); } redisTemplate.delete(favoriteKeyList); + // 删除库 + FavoriteQueryRequest request = new FavoriteQueryRequest(); + request.setUserIdList(userIdList); + favoriteService.deleteFavorite(request); } @Override @Async("asyncExecutor") public void deleteFavoriteByRelId(Long relId) { + if (relId == null) { + return; + } // 只删除数据库 redis 等自动失效 FavoriteQueryRequest request = new FavoriteQueryRequest(); request.setRelId(relId); @@ -123,6 +142,9 @@ public class FavoriteApiImpl implements FavoriteApi { @Override public void deleteFavoriteByRelIdList(List relIdList) { + if (Lists.isEmpty(relIdList)) { + return; + } // 只删除数据库 redis 等自动失效 FavoriteQueryRequest request = new FavoriteQueryRequest(); request.setRelIdList(relIdList);