From c402e77c8a141b05d5ef62b73306ba7322585bb2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期三, 14 一月 2026 13:24:46 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 1
/dev/null | 12 ------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/DirectionDto.java | 17 ++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/DirectionType.java | 15 +++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 16 --------
5 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/DirectionDto.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/DirectionDto.java
new file mode 100644
index 0000000..904aa1d
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/DirectionDto.java
@@ -0,0 +1,17 @@
+package com.zy.acs.manager.core.domain;
+
+
+import com.zy.acs.manager.core.domain.type.DirectionType;
+import lombok.Data;
+
+/**
+ * Created by vincent on 2026/1/14
+ */
+@Data
+public class DirectionDto {
+
+ private DirectionType direction;
+
+ private Boolean enabled;
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/DirectionType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/DirectionType.java
new file mode 100644
index 0000000..54674fc
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/DirectionType.java
@@ -0,0 +1,15 @@
+package com.zy.acs.manager.core.domain.type;
+
+public enum DirectionType {
+
+// NORTH, EAST, SOUTH, WEST,
+// ;
+
+ NONE,
+ TOP,
+ LEFT,
+ BOTTOM,
+ RIGHT,
+ ;
+
+}
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 091f636..745c251 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
@@ -936,7 +936,6 @@
if (!lastCode.getData().equals(code.getData())) {
// 璧拌璺緞鑺傜偣
-// List<String> pathList = mapService.checkoutPath(agv.getUuid(), lastCode, code);
List<String> pathListPart = pathList.subList(pathList.indexOf(lastCode.getData()), pathList.indexOf(code.getData()) + 1);
for (int i = 0; i < pathListPart.size(); i++) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
index 9c975e1..21c0dfb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
@@ -188,22 +188,6 @@
return Math.sqrt(deltaX * deltaX + deltaY * deltaY);
}
- public DirectionType calcDirectionType(int[] originIdx, int[] oppositeIdx) {
- if (oppositeIdx[0] < originIdx[0] && oppositeIdx[1] == originIdx[1]) {
- return DirectionType.TOP;
- }
- if (oppositeIdx[0] > originIdx[0] && oppositeIdx[1] == originIdx[1]) {
- return DirectionType.BOTTOM;
- }
- if (oppositeIdx[0] == originIdx[0] && oppositeIdx[1] > originIdx[1]) {
- return DirectionType.RIGHT;
- }
- if (oppositeIdx[0] == originIdx[0] && oppositeIdx[1] < originIdx[1]) {
- return DirectionType.LEFT;
- }
- return DirectionType.NONE;
- }
-
public void lockPath(Integer lev, List<String> pathList, String agvNo) {
List<int[]> codeMatrixIdxList = mapDataDispatcher.getCodeMatrixIdxList(lev, pathList);
mapDataDispatcher.modifyDynamicMatrix(lev, codeMatrixIdxList, agvNo);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/DirectionType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/DirectionType.java
deleted file mode 100644
index 612d62a..0000000
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/DirectionType.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.acs.manager.core.service.astart;
-
-public enum DirectionType {
-
- NONE,
- TOP,
- LEFT,
- BOTTOM,
- RIGHT,
- ;
-
-}
--
Gitblit v1.9.1