From f1b421b67ecf52431388d7b66e5e950d6d139ac4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 11 二月 2025 11:35:28 +0800
Subject: [PATCH] Merge branches 'master' and 'master' of https://gitee.com/xiaochen991015/xizang

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java |   46 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 41 insertions(+), 5 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 44e80d8..932a4af 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
@@ -1,16 +1,14 @@
 package com.ruoyi.common.core.redis;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
+import org.springframework.data.redis.core.script.RedisScript;
 import org.springframework.stereotype.Component;
 
 /**
@@ -22,6 +20,15 @@
 @Component
 public class RedisCache
 {
+    private static final String LOCK_PREFIX = "lock:";
+    private static final RedisScript<Long> UNLOCK_SCRIPT = new DefaultRedisScript<>(
+            "if redis.call('get', KEYS[1]) == ARGV[1] then " +
+                    "  return redis.call('del', KEYS[1]) " +
+                    "else " +
+                    "  return 0 " +
+                    "end",
+            Long.class
+    );
     @Autowired
     public RedisTemplate redisTemplate;
 
@@ -265,4 +272,33 @@
     {
         return redisTemplate.keys(pattern);
     }
+
+    /**
+     * 尝试加锁
+     *
+     * @param lockKey   锁的key
+     * @param requestId 锁的持有者标识符(如UUID)
+     * @param expireTime 锁的过期时间(秒)
+     * @return 加锁成功返回true,否则返回false
+     */
+    public boolean tryLock(String lockKey, String requestId, long expireTime) {
+        String lockKeyWithPrefix = LOCK_PREFIX + lockKey;
+        // 使用SET命令的NX和PX选项来加锁
+        Boolean result = redisTemplate.opsForValue().setIfAbsent(lockKeyWithPrefix, requestId, expireTime, TimeUnit.SECONDS);
+        return result != null && result;
+    }
+
+    /**
+     * 解锁
+     *
+     * @param lockKey   锁的key
+     * @param requestId 锁的持有者标识符(如UUID)
+     * @return 解锁成功返回true,否则返回false
+     */
+    public boolean unlock(String lockKey, String requestId) {
+        String lockKeyWithPrefix = LOCK_PREFIX + lockKey;
+        // 使用Lua脚本来验证锁的持有者并解锁
+        Long result = (Long) redisTemplate.execute(UNLOCK_SCRIPT, Collections.singletonList(lockKeyWithPrefix), requestId);
+        return result != null && result == 1L;
+    }
 }

--
Gitblit v1.7.1