From 5317406cff3620bcf5333696eb04637e18f5e0f2 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 19 三月 2026 14:39:26 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java
index d2535f8..3cc735d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java
@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import com.zy.acs.common.utils.News;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -37,7 +38,7 @@
mainService.buildMajorTask(agvId, taskList);
} catch (Exception e) {
- log.error("MainLockWrapService.buildMajorTask[task]", e);
+ News.error("MainLockWrapService.buildMajorTask[task]", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
} finally {
if (lockAcquired) {
@@ -46,17 +47,17 @@
}
}
- public boolean buildMinorTask(Agv agv, TaskTypeType taskType, String destination, Jam jam) {
+ public boolean buildMinorTask(Long agvId, TaskTypeType taskType, String destination, Jam jam) {
boolean lockAcquired = false;
try {
if (!(lockAcquired = this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS))) {
throw new CoolException("failed to generate [minor task] actions, cause can not acquire lock ...");
}
-// log.info("buildMinorTask AGV[{}] lock time: {}", agv.getUuid(), System.currentTimeMillis());
+// News.info("buildMinorTask AGV[{}] lock time: {}", agv.getUuid(), System.currentTimeMillis());
- return mainService.buildMinorTask(agv, taskType, destination, jam);
+ return mainService.buildMinorTask(agvId, taskType, destination, jam);
} catch (Exception e) {
- log.error("MainLockWrapService.buildMinorTask[task]", e);
+ News.error("MainLockWrapService.buildMinorTask[task]", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return false;
@@ -65,8 +66,8 @@
if (lockAcquired) {
this.lock.unlock();
}
-// log.info("buildMinorTask AGV[{}] unlock time: {}", agv.getUuid(), System.currentTimeMillis());
+// News.info("buildMinorTask AGV[{}] unlock time: {}", agv.getUuid(), System.currentTimeMillis());
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1