diff --git a/ebike-operations/src/main/java/com/cdzy/operations/component/SafeOrderExpirationListener.java b/ebike-operations/src/main/java/com/cdzy/operations/component/SafeOrderExpirationListener.java index c3d7383..5504508 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/component/SafeOrderExpirationListener.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/component/SafeOrderExpirationListener.java @@ -33,9 +33,10 @@ public class SafeOrderExpirationListener { // Redis键常量 private static final String ORDER_KEY_PREFIX = "bike:dispatch:lock:"; - private static final long LOCK_WAIT_TIME = 5L; // 获取锁等待时间(秒) + // 获取锁等待时间(秒) + private static final long LOCK_WAIT_TIME = 5L; - private static final String CODE_KEY_PREFIX = "bike:no:lock:"; + private static final String NO_DOCUMENT_LOCK_PREFIX = "bike:dispatch:nodocumentlock:"; /** * 处理Redis键过期事件 @@ -111,7 +112,7 @@ public class SafeOrderExpirationListener { private void processExpiredNoDocumentSafely(String bikeCode) { String instanceId = instanceManager.getInstanceId(); - String lockKey = CODE_KEY_PREFIX + bikeCode; + String lockKey = NO_DOCUMENT_LOCK_PREFIX + bikeCode; // 使用RedisUtil的分布式锁功能 boolean locked = redisUtil.tryNoDocumentLock(lockKey, instanceId, LOCK_WAIT_TIME, TimeUnit.SECONDS); @@ -145,7 +146,7 @@ public class SafeOrderExpirationListener { if (instanceId.equals(currentLockValue)) { redisUtil.releaseDispatchLock(lockKey); } - log.info("已释放Rdies分布式锁: lockKey={} ", lockKey); + log.info("已释放redis分布式锁: lockKey={} ", lockKey); } catch (Exception e) { log.error("释放锁异常: lockKey={}", lockKey, e); } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/utils/RedisUtil.java b/ebike-operations/src/main/java/com/cdzy/operations/utils/RedisUtil.java index c130e2c..b79ff58 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/utils/RedisUtil.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/utils/RedisUtil.java @@ -42,7 +42,7 @@ public class RedisUtil { public static final String BIKE_ECU_PREFIX = "bike:ecu:"; // 车辆多长时间无单生成调度工单 - public static final String BIKE_NO_DOCUMENT_PREFIX = "bike:no:document:"; + public static final String BIKE_NO_DOCUMENT_PREFIX = "bike:dispatch:nodocument:"; /** @@ -501,12 +501,6 @@ public class RedisUtil { return getRedisTemplate(Database.DB2).opsForValue().setIfAbsent(lockKey, value, timeout, unit); } - /** - * 数据库2专用:释放调度锁 - */ - public Boolean releaseNoDocumentLock(String lockKey) { - return delete(Database.DB2, lockKey); - } /** * 数据库2专用:存储中控信息