From 8e6a6ee229b8a14ec3cac6b428921cbde8dcf53d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 15 十一月 2024 09:24:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 10 ++++++----
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 4 +++-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 4 ++--
zy-acs-flow/src/map/tool.js | 1 +
zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java | 6 +++---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 2 +-
7 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 0e8d84b..045b324 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -684,6 +684,7 @@
agvSprite.position.set(codeSprite.position.x, codeSprite.position.y);
agvSprite.rotation = targetRotation + agvRotationOffset;
mapContainer.addChild(agvSprite);
+ console.log(agvSprite, setCurSprite);
beInsight(agvSprite, setCurSprite);
// agvNo sprite
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
index 541a3ed..4a605e3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
@@ -112,13 +112,13 @@
if (null == endCode) {
return R.error();
}
- if (!mainLockWrapService.buildMinorTask(agv, agvDetail, param.getTaskMode(), endCode.getData())) {
+ if (!mainLockWrapService.buildMinorTask(agv, param.getTaskMode(), endCode.getData(), null)) {
return R.error();
}
break;
case TO_CHARGE:
case TO_STANDBY:
- if (!mainLockWrapService.buildMinorTask(agv, agvDetail, param.getTaskMode(), null)) {
+ if (!mainLockWrapService.buildMinorTask(agv, param.getTaskMode(), null, null)) {
return R.error();
}
break;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
index a76a507..59dae6c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -81,7 +81,7 @@
continue;
}
- mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
+ mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_CHARGE, null, null);
}
}
}
@@ -144,7 +144,7 @@
}
// }
- mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
+ mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_STANDBY, null, null);
}
}
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..d2535f8 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
@@ -2,7 +2,7 @@
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 lombok.extern.slf4j.Slf4j;
@@ -46,7 +46,7 @@
}
}
- public boolean buildMinorTask(Agv agv, AgvDetail agvDetail, TaskTypeType taskType, String destination) {
+ public boolean buildMinorTask(Agv agv, TaskTypeType taskType, String destination, Jam jam) {
boolean lockAcquired = false;
try {
if (!(lockAcquired = this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS))) {
@@ -54,7 +54,7 @@
}
// log.info("buildMinorTask AGV[{}] lock time: {}", agv.getUuid(), System.currentTimeMillis());
- return mainService.buildMinorTask(agv, agvDetail, taskType, destination);
+ return mainService.buildMinorTask(agv, taskType, destination, jam);
} catch (Exception e) {
log.error("MainLockWrapService.buildMinorTask[task]", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
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 4fcedee..0c0703d 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
@@ -491,12 +491,10 @@
* 鍏呯數 鍥炲緟鏈轰綅浠诲姟
*/
@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) {
+ public boolean buildMinorTask(Agv agv, TaskTypeType taskType, String destination, Jam jam) {
if (Cools.isEmpty(agv, taskType)) { return false; }
try {
- if (null == agvDetail) {
- agvDetail = agvDetailService.selectByAgvId(agv.getId());
- }
+ AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (!agvService.judgeEnable(agv.getId())) {
return false;
}
@@ -602,6 +600,10 @@
}
if (!segmentService.save(next)) {
throw new BusinessException("segment failed to save");
+ } else {
+ if (null != jam && i == 0) {
+ jam.setAvoSeg(next.getId());
+ }
}
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
index 012b4b9..d818b04 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
@@ -84,7 +84,7 @@
if (null == destinationCode) {
return;
}
- if (mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.MOVE, destinationCode.getData())) {
+ if (mainLockWrapService.buildMinorTask(agv, TaskTypeType.MOVE, destinationCode.getData(), null)) {
log.info(agv.getUuid() + "寮�濮嬭蛋琛屾紨绀�...");
}
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
index 45c6fb4..8a5d41f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -453,11 +453,13 @@
if (!segmentService.save(insertSeg)) {
log.error("Segment [{}] 淇濆瓨澶辫触 锛侊紒锛�", segment.getTravelId() + " - " + segment.getSerial());
return false;
+ } else {
+ jam.setAvoSeg(insertSeg.getId());
}
} else {
- return mainLockWrapService.buildMinorTask(agv, null, TaskTypeType.MOVE, endCodeData);
+ return mainLockWrapService.buildMinorTask(agv, TaskTypeType.MOVE, endCodeData, jam);
}
return true;
--
Gitblit v1.9.1