root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redission修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-02-16 21:12:22 +08:00
parent 4373694c3a
commit 7eec5eacfc
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -522,11 +522,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("status", HttpStatus.OK.value()); result.put("status", HttpStatus.OK.value());
result.put("message", "反馈成功!"); result.put("message", "反馈成功!");
<<<<<<< HEAD
RLock lock = redissonClient.getLock("acs_to_deviceApply_wms:" + type); RLock lock = redissonClient.getLock("acs_to_deviceApply_wms:" + type);
=======
RLock lock = redissonClient.getLock("AcsToWmsServiceImpl_deviceApply:" + type);
>>>>>>> 977110a29f1889255889822be9a0ba275ad2fde6
boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS); boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS);
try { try {