From 090bf407236ef5be8ea7ba803a56fdcc2dcc1ce3 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期三, 01 十一月 2023 17:37:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/core/util/LockManage.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/core/util/LockManage.java b/consum-base/src/main/java/com/consum/base/core/util/LockManage.java
index 8fcc9ef..ac6f8b8 100644
--- a/consum-base/src/main/java/com/consum/base/core/util/LockManage.java
+++ b/consum-base/src/main/java/com/consum/base/core/util/LockManage.java
@@ -12,8 +12,8 @@
public class LockManage {
private static final ConcurrentHashMap<String, Object> lockMap = new ConcurrentHashMap<>();
- public static Object acquireLock(Long warehouseId, Long goodsModelsId) {
- String key = warehouseId + "-" + goodsModelsId;
+ public static Object acquireLock(int warehouseType, Long warehouseId, Long goodsModelsId) {
+ String key = warehouseType + "-" + warehouseId + "-" + goodsModelsId;
return lockMap.computeIfAbsent(key, k -> new Object());
}
}
--
Gitblit v1.9.1