From 48eefc082760c3f859656e5375f5a71b04f38054 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 十一月 2024 08:11:57 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 37 ++++++++++---------------------------
1 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 9544127..ca8080e 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -21,6 +21,7 @@
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.domain.TaskDto;
+import com.zy.acs.manager.common.domain.param.HandlerPublishParam;
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.common.utils.CommonUtil;
import com.zy.acs.manager.core.domain.AgvBackpackDto;
@@ -35,11 +36,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.*;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
@@ -271,16 +272,12 @@
/**
* 瑙ｆ瀽鍙栨斁璐ч泦鍚堜换鍔�,杩涜鏈�浼樼殑鎺掑垪缁勫悎椤哄簭 ( 杞﹁締姝ゆ椂鏄┖闂蹭笖闈欐鐨� )
+ * todo: {@link com.zy.acs.manager.core.HandlerController#controlAgv(String, HandlerPublishParam)}
*/
- @Transactional
- public synchronized void buildMajorTask(Long agvId, List<Task> taskList) {
- if (Cools.isEmpty(taskList)) { return; }
- boolean lockAcquired = false;
+ @Transactional(propagation = Propagation.REQUIRES_NEW)
+ public void buildMajorTask(Long agvId, List<Task> taskList) {
+ if (Cools.isEmpty(agvId, taskList)) { return; }
try {
- if (!(lockAcquired = this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS))) {
- throw new CoolException("generate [task] action fail, cause can not acquire lock ...");
- }
-
// valid -----------------------------------------------
Agv agv = agvService.getById(agvId);
if (!agvService.judgeEnable(agv.getId(), true)) {
@@ -516,28 +513,19 @@
} catch (Exception e) {
- log.error("mainService.mergeMajorTask[task]", e);
+ log.error("mainService.buildMajorTask[task]", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- } finally {
-
- if (lockAcquired) {
- this.lock.unlock();
- }
}
}
+
/**
* 鍏呯數 鍥炲緟鏈轰綅浠诲姟
*/
- @Transactional
- public synchronized boolean buildMinorTask(Agv agv, AgvDetail agvDetail, TaskTypeType taskType, String destination) {
+ @Transactional(propagation = Propagation.REQUIRES_NEW) // although there is a Transactional here that the lock is isolated, but we can't join the caller's Transactional
+ public boolean buildMinorTask(Agv agv, AgvDetail agvDetail, TaskTypeType taskType, String destination) {
if (Cools.isEmpty(agv, taskType)) { return false; }
- boolean lockAcquired = false;
try {
- if (!(lockAcquired = this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS))) {
- throw new CoolException("generate [task] action fail, cause can not acquire lock ...");
- }
-
if (null == agvDetail) {
agvDetail = agvDetailService.selectByAgvId(agv.getId());
}
@@ -668,11 +656,6 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return false;
- } finally {
-
- if (lockAcquired) {
- this.lock.unlock();
- }
}
}
--
Gitblit v1.9.1