From ca9d1359afeb60ca2dc7215b17535c4bd5e6f274 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 10:19:16 +0800
Subject: [PATCH] #
---
version/db/new.sql | 4 +++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java | 4 ++--
zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvDirectionType.java | 11 ++++++++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 11 ++---------
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/version/db/new.sql b/version/db/new.sql
index 33c3b80..b6058d0 100644
--- a/version/db/new.sql
+++ b/version/db/new.sql
@@ -57,4 +57,6 @@
`update_time` timestamp DEFAULT CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿',
`memo` VARCHAR(255) DEFAULT NULL COMMENT '澶囨敞',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+update man_loc set comp_direct =2 where comp_direct =0
\ No newline at end of file
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvDirectionType.java b/zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvDirectionType.java
index 7454ec5..adefeb4 100644
--- a/zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvDirectionType.java
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvDirectionType.java
@@ -4,7 +4,7 @@
LEFT(1),
RIGHT(2),
- FORWARD(0),
+ FORWARD(3),
;
public int val;
@@ -13,4 +13,13 @@
this.val = val;
}
+ public static AgvDirectionType fromVal(int val) {
+ for (AgvDirectionType type : AgvDirectionType.values()) {
+ if (type.val == val) {
+ return type;
+ }
+ }
+ throw new IllegalArgumentException("Invalid AgvDirectionType: " + val);
+ }
+
}
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 15614f4..c3cb502 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
@@ -160,15 +160,8 @@
// 鍧愭爣璐ф灦闃堝�� todo:luxiaotao
public AgvDirectionType calculateAgvWorkDirectionByShelf(Loc loc, Code code) {
- Integer compDirect = loc.getCompDirect();
- AgvDirectionType agvDirectionType = null;
- if (compDirect == 0) {
- agvDirectionType = AgvDirectionType.RIGHT;
- }
- if (compDirect == 1) {
- agvDirectionType = AgvDirectionType.LEFT;
- }
- return agvDirectionType;
+ Integer compDirect = loc.getCompDirect();
+ return AgvDirectionType.fromVal(compDirect);
}
public Double getStaAngle(Sta sta, Double workDirection) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
index d34dc3b..3b73564 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
@@ -57,9 +57,9 @@
private Long code;
/**
- * 姣旂爜鏂瑰悜闃� 1: 澶т簬 0 灏忎簬
+ * 姣旂爜鏂瑰悜闃�
*/
- @ApiModelProperty(value= "姣旂爜鏂瑰悜闃� 1: 澶т簬 0 灏忎簬")
+ @ApiModelProperty(value= "姣旂爜鏂瑰悜闃�")
private Integer compDirect;
/**
--
Gitblit v1.9.1