From d7e3192804fca756d881af360ffd5eea157ef9ad Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 21 十月 2026 15:45:18 +0800
Subject: [PATCH] 【市一】电话挂断服务
---
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 65282ec..f5a54a1 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,9 @@
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;
@@ -14,6 +16,7 @@
*
* @author ruoyi
**/
+@Slf4j
@SuppressWarnings(value = {"unchecked", "rawtypes"})
@Component
public class RedisCache {
@@ -44,6 +47,20 @@
*/
public <T> void setCacheObject(final String key, final T value, final long timeout, final TimeUnit timeUnit) {
redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+ }
+
+ /**
+ * 缂撳瓨瀵硅薄锛屼粎褰� key 涓嶅瓨鍦ㄦ椂鎵嶅啓鍏ワ紙鍘熷瓙鎿嶄綔锛夛紝鐢ㄤ簬骞傜瓑浜掓枼鏍囪
+ *
+ * @param key 缂撳瓨鐨勯敭鍊�
+ * @param value 缂撳瓨鐨勫��
+ * @param timeout 鏃堕棿
+ * @param timeUnit 鏃堕棿棰楃矑搴�
+ * @return true=鏈鍐欏叆鎴愬姛锛堜箣鍓嶄笉瀛樺湪锛夛紱false=key 宸插瓨鍦紝鏈啓鍏�
+ */
+ public <T> boolean setCacheObjectIfAbsent(final String key, final T value, final long timeout, final TimeUnit timeUnit) {
+ Boolean success = redisTemplate.opsForValue().setIfAbsent(key, value, timeout, timeUnit);
+ return Boolean.TRUE.equals(success);
}
/**
@@ -289,9 +306,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;
+ }
}
/**
--
Gitblit v1.9.3