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

service去redisson

Browse Source
This commit is contained in:
zhangzhiqiang
2023-02-05 21:56:59 +08:00
parent c89e370a51
commit 046a55915e
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lms/nladmin-system/pom.xml
View File

@@ -340,17 +340,17 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId> <artifactId>spring-boot-starter-websocket</artifactId>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.redisson</groupId> <!-- <groupId>org.redisson</groupId>-->
<artifactId>redisson-spring-boot-starter</artifactId> <!-- <artifactId>redisson-spring-boot-starter</artifactId>-->
<version>3.12.3</version> <!-- <version>3.12.3</version>-->
<exclusions> <!-- <exclusions>-->
<exclusion> <!-- <exclusion>-->
<artifactId>spring-boot-starter-actuator</artifactId> <!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
<groupId>org.springframework.boot</groupId> <!-- <groupId>org.springframework.boot</groupId>-->
</exclusion> <!-- </exclusion>-->
</exclusions> <!-- </exclusions>-->
</dependency> <!-- </dependency>-->
<!-- jwt --> <!-- jwt -->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>

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

@@ -28,8 +28,6 @@ import org.nl.wms.sch.tasks.EmptyVehicleTask;
import org.nl.wms.sch.tasks.SendOutTask; import org.nl.wms.sch.tasks.SendOutTask;
import org.nl.wms.st.inbill.service.RawAssistIStorService; import org.nl.wms.st.inbill.service.RawAssistIStorService;
import org.nl.wms.st.inbill.service.StorPublicService; 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.http.HttpStatus;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +55,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
private final CutConveyorTask cutConveyorTask; private final CutConveyorTask cutConveyorTask;
private final RedissonClient redissonClient; // private final RedissonClient redissonClient;
/** /**
* task_id：任务标识 * task_id：任务标识
@@ -196,10 +194,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("apply请求参数：---------------------------------------------"+whereJson.toString()); log.info("apply请求参数：---------------------------------------------"+whereJson.toString());
String type = whereJson.getString("type"); String type = whereJson.getString("type");
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
RLock lock = redissonClient.getLock("acs_to_wms:" + type); synchronized (lock.intern(type)){
boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS);
try {
if (tryLock){
{ {
String device_code = whereJson.getString("device_code"); String device_code = whereJson.getString("device_code");
String vehicle_code = whereJson.getString("vehicle_code"); String vehicle_code = whereJson.getString("vehicle_code");
@@ -450,14 +445,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
return result; return result;
} }
} }
}finally {
if (tryLock){
lock.unlock();
}
}
result.put("status", HttpStatus.BAD_REQUEST.value());
result.put("message", "申请任务超时！"+type);
return result;
} }
@Override @Override