From e6456d2196b3e57bd06be0fbc74dd3e0fc28fdeb Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 22 七月 2025 19:17:55 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
index 5eecedc..8955e98 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
@@ -5,6 +5,7 @@
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.DataType;
 import org.springframework.data.redis.core.*;
 import org.springframework.stereotype.Component;
 
@@ -141,21 +142,23 @@
     /**
      * 缂撳瓨List鏁版嵁
      *
-     * @param cacheKey      缂撳瓨鐨勯敭鍊�
-     * @param list 寰呯紦瀛樼殑List鏁版嵁(杩欓噷濡傛灉鏂板鐨勮瘽锛屾槸寰�澶撮儴鏂板)骞跺幓閲�
+     * @param cacheKey 缂撳瓨鐨勯敭鍊�
+     * @param list     寰呯紦瀛樼殑List鏁版嵁(杩欓噷濡傛灉鏂板鐨勮瘽锛屾槸寰�澶撮儴鏂板)骞跺幓閲�
      * @return 缂撳瓨鐨勫璞�
      */
     public void setCacheListLeftAndDistinct(String cacheKey, List<String> list) {
-        // 鑾峰彇 ListOperations 瀵硅薄锛岀敤浜庢搷浣� Redis List
-        ListOperations<String, String> listOps = redisTemplate.opsForList();
+        // 妫�鏌� key 绫诲瀷
+        DataType keyType = redisTemplate.type(cacheKey);
+        if (keyType != DataType.NONE && keyType != DataType.LIST) {
+            // 濡傛灉宸茬粡瀛樺湪浣嗕笉鏄� list 绫诲瀷锛屽垹闄ゅ畠锛堟垨鐩存帴鎶涘紓甯镐篃鍙級
+            redisTemplate.delete(cacheKey);
+        }
 
-        // 鑾峰彇鐜版湁鐨� cache-0 鍒楄〃涓殑鎵�鏈夊��
+        ListOperations<String, String> listOps = redisTemplate.opsForList();
         List<String> existingValues = listOps.range(cacheKey, 0, -1);
 
-        // 杩囨护鍑轰笉鍦� Redis 鍒楄〃涓殑鍊�
         List<String> newValues = list.stream().filter(value -> !existingValues.contains(value)).collect(Collectors.toList());
 
-        // 灏嗘柊鐨勫�兼坊鍔犲埌 Redis 鍒楄〃鐨勫乏渚�
         if (!newValues.isEmpty()) {
             listOps.leftPushAll(cacheKey, newValues);
         }

--
Gitblit v1.9.3