diff --git a/lms/nladmin-system/pom.xml b/lms/nladmin-system/pom.xml
index 7162be2b2..8a739243b 100644
--- a/lms/nladmin-system/pom.xml
+++ b/lms/nladmin-system/pom.xml
@@ -340,17 +340,17 @@
org.springframework.boot
spring-boot-starter-websocket
-
- org.redisson
- redisson-spring-boot-starter
- 3.12.3
-
-
- spring-boot-starter-actuator
- org.springframework.boot
-
-
-
+
+
+
+
+
+
+
+
+
+
+
io.jsonwebtoken
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 875af7050..e4f0a3e75 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -28,8 +28,6 @@ import org.nl.wms.sch.tasks.EmptyVehicleTask;
import org.nl.wms.sch.tasks.SendOutTask;
import org.nl.wms.st.inbill.service.RawAssistIStorService;
import org.nl.wms.st.inbill.service.StorPublicService;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +55,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
private final CutConveyorTask cutConveyorTask;
- private final RedissonClient redissonClient;
+// private final RedissonClient redissonClient;
/**
* task_id:任务标识
@@ -196,10 +194,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("apply请求参数:---------------------------------------------"+whereJson.toString());
String type = whereJson.getString("type");
JSONObject result = new JSONObject();
- RLock lock = redissonClient.getLock("acs_to_wms:" + type);
- boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS);
- try {
- if (tryLock){
+ synchronized (lock.intern(type)){
{
String device_code = whereJson.getString("device_code");
String vehicle_code = whereJson.getString("vehicle_code");
@@ -450,14 +445,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
return result;
}
}
- }finally {
- if (tryLock){
- lock.unlock();
- }
- }
- result.put("status", HttpStatus.BAD_REQUEST.value());
- result.put("message", "申请任务超时!"+type);
- return result;
+
}
@Override