From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 cd8f4f6..7ebe7fb 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
@@ -1,10 +1,11 @@
package com.zy.acs.manager.core.service;
+import com.zy.acs.common.utils.News;
import com.zy.acs.framework.exception.CoolException;
-import com.zy.acs.manager.manager.entity.Agv;
-import com.zy.acs.manager.manager.entity.AgvDetail;
+import com.zy.acs.manager.manager.entity.Jam;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskTypeType;
+import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +27,8 @@
@Autowired
private MainService mainService;
+ @Autowired
+ private ConfigService configService;
public void buildMajorTask(Long agvId, List<Task> taskList) {
boolean lockAcquired = false;
@@ -37,7 +40,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 +49,16 @@
}
}
- public boolean buildMinorTask(Agv agv, AgvDetail agvDetail, TaskTypeType taskType, String destination) {
+ 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());
- return mainService.buildMinorTask(agv, agvDetail, taskType, destination);
+ 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 +67,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