From 6d52b8631cc608d5c4be5c738939c3a466d411fd Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 20 十月 2026 15:41:51 +0800
Subject: [PATCH] 【丽水】Redis类型匹配报错
---
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 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..ab16600 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
@@ -4,7 +4,10 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.redis.connection.DataType;
import org.springframework.data.redis.core.*;
import org.springframework.stereotype.Component;
@@ -13,6 +16,7 @@
*
* @author ruoyi
**/
+@Slf4j
@SuppressWarnings(value = {"unchecked", "rawtypes"})
@Component
public class RedisCache {
@@ -27,6 +31,10 @@
*/
public <T> void setCacheObject(final String key, final T value) {
redisTemplate.opsForValue().set(key, value);
+ }
+
+ public <T> void setCacheList(final String key, final List<T> values) {
+ redisTemplate.opsForList().rightPushAll(key, values);
}
/**
@@ -141,21 +149,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);
}
@@ -282,9 +292,25 @@
* @return Long 澶т簬0琛ㄧず鍒犻櫎浜嗗嚑涓紝绛変簬0琛ㄧず娌℃湁鍒犻櫎锛屽皬浜�0琛ㄧず鍦ㄦ墽琛屽垹闄ゆ搷浣滄椂鍙戠敓浜嗛敊璇�
*/
public Long removeElementFromList(String key, String valueToRemove) {
- ListOperations<String, String> listOps = redisTemplate.opsForList();
- Long remove = listOps.remove(key, 0, valueToRemove);
- return remove;
+ // 鍏堝垽鏂� key 鐨勭被鍨嬶紝閬垮厤 key 琚叾瀹冧笟鍔�/鏃х増鏈唬鐮佸啓鎴愪簡 String銆丠ash 绛夐潪 List 绫诲瀷鏃舵姏 WRONGTYPE
+ DataType keyType = redisTemplate.type(key);
+ if (keyType == DataType.NONE) {
+ return 0L;
+ }
+ if (keyType != DataType.LIST) {
+ // 璇� key 鏈韩鏄綔涓洪槦鍒椾娇鐢ㄧ殑锛岀被鍨嬩笉瀵硅鏄庢槸鑴忔暟鎹紝鐩存帴鍒犻櫎锛岀瓑涓嬫鍐欏叆鏃堕噸鏂板垱寤轰负 List
+ log.warn("Redis key [{}] 鐨勭被鍨嬩负 {}锛屼笉鏄� List锛屽凡鍒犻櫎璇ヨ剰鏁版嵁锛岄伩鍏� WRONGTYPE 寮傚父", key, keyType);
+ redisTemplate.delete(key);
+ return 0L;
+ }
+ try {
+ Long remove = redisTemplate.opsForList().remove(key, 0, valueToRemove);
+ return remove == null ? 0L : remove;
+ } catch (DataAccessException e) {
+ // 绫诲瀷妫�鏌ュ拰鍒犻櫎涔嬮棿 key 琚叾瀹冨簲鐢ㄦ敼鍐欎负鍏跺畠绫诲瀷绛夋瀬绔儏鍐靛厹搴曪紝缂撳瓨娓呯悊澶辫触涓嶅簲褰卞搷涓讳笟鍔℃祦绋�
+ log.warn("浠� Redis List [{}] 绉婚櫎鍏冪礌 [{}] 澶辫触锛歿}", key, valueToRemove, e.getMessage());
+ return 0L;
+ }
}
/**
@@ -296,4 +322,27 @@
public Collection<String> keys(final String pattern) {
return redisTemplate.keys(pattern);
}
+
+ /**
+ * 鑾峰彇褰撳墠key鍊肩殑鏁伴噺
+ * @param key
+ * @return
+ */
+ public Long getListSize(String key) {
+ // 妫�鏌� key 绫诲瀷
+ DataType keyType = redisTemplate.type(key);
+
+ // 濡傛灉 key 涓嶅瓨鍦紝杩斿洖 0
+ if (keyType == DataType.NONE) {
+ return 0L;
+ }
+
+ // 濡傛灉涓嶆槸 List 绫诲瀷锛屽垹闄ゅ畠骞惰繑鍥� 0锛堥槻姝� WRONGTYPE 閿欒锛�
+ if (keyType != DataType.LIST) {
+ redisTemplate.delete(key);
+ return 0L;
+ }
+
+ return redisTemplate.opsForList().size(key);
+ }
}
--
Gitblit v1.9.3