From 1bdaf9be340892e1654caea9ed4082b6c61beb3b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 09 三月 2026 15:54:02 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
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 d90a532..82804fd 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
@@ -7,6 +7,7 @@
import com.zy.acs.manager.core.constant.MapDataConstant;
import com.zy.acs.manager.core.domain.DirectionDto;
import com.zy.acs.manager.core.domain.LaneDto;
+import com.zy.acs.manager.core.domain.PathDto;
import com.zy.acs.manager.core.domain.SortCodeDto;
import com.zy.acs.manager.core.domain.UnlockPathTask;
import com.zy.acs.manager.core.domain.VehicleFootprint;
@@ -37,7 +38,7 @@
* Created by vincent on 2023/6/14
*/
@Slf4j
-@Component("mapService")
+@Component
public class MapService {
private static final double EPS = 1e-7;
@@ -205,9 +206,20 @@
return Math.sqrt(deltaX * deltaX + deltaY * deltaY);
}
- public void lockPath(Integer lev, List<String> pathList, String agvNo) {
- List<int[]> codeMatrixIdxList = mapDataDispatcher.getCodeMatrixIdxList(lev, pathList);
- mapDataDispatcher.modifyDynamicMatrix(lev, codeMatrixIdxList, agvNo);
+ public void lockPath(Integer lev, List<PathDto> pathList, String agvNo) {
+ if (Cools.isEmpty(agvNo, pathList)) {
+ return;
+ }
+ List<PathDto> normalized = pathList.stream()
+ .filter(Objects::nonNull)
+ .filter(dto -> !Cools.isEmpty(dto.getCode()))
+ .collect(Collectors.toList());
+ if (Cools.isEmpty(normalized)) {
+ return;
+ }
+ List<String> codeList = normalized.stream().map(PathDto::getCode).collect(Collectors.toList());
+ List<int[]> codeMatrixIdxList = mapDataDispatcher.getCodeMatrixIdxList(lev, codeList);
+ mapDataDispatcher.modifyDynamicMatrix(lev, codeMatrixIdxList, agvNo, normalized);
}
public void unlockPath(String agvNo, String codeData) {
@@ -370,31 +382,41 @@
private boolean isInsideExpandedFootprint(double px, double py, double centerX, double centerY
, VehicleFootprint footprint, double headingRad, double buffer) {
+ // 涓�銆侀噸缃垚浠ヨ溅杈嗕负鍘熺偣涓旇溅澶翠负x銆亂姝ｆ柟鍚戠殑鍧愭爣绯�
+ // 鍚戦噺骞崇Щ锛屽湴鍥惧潗鏍囩郴杞埌浠ヨ溅杈嗕腑蹇冧负鍘熺偣鐨勫潗鏍囩郴锛屼娇杞﹁締涓績鍙樻垚鏂扮殑鍘熺偣锛堟柟渚胯绠楋級
double dx = px - centerX;
double dy = py - centerY;
+ // 鍐嶆妸鍧愭爣鏃嬭浆鍒拌溅杈嗗潗鏍囩郴锛坙ocalX 鎸囧悜杞﹀ご锛宭ocalY 鎸囧悜杞﹁締宸︿晶锛夛紝鍙栨秷鍘熷湴鍥剧殑杞﹁締鏃嬭浆鏂瑰悜
double localX = dx * Math.cos(headingRad) + dy * Math.sin(headingRad);
double localY = -dx * Math.sin(headingRad) + dy * Math.cos(headingRad);
- double xMin = -footprint.getTail();
- double xMax = footprint.getHead();
- double yMin = -footprint.getHalfWidth();
- double yMax = footprint.getHalfWidth();
+ // 浜屻�佽溅杈嗗湪鑷韩鍧愭爣绯讳腑鐨勭煩褰㈣寖鍥�
+ double xMax = footprint.getHead(); // localX鏂瑰悜锛� 鍚戝墠锛堣溅澶存柟鍚戯級鏄鍊�
+ double xMin = -footprint.getTail(); // localX鏂瑰悜锛� 鍚戝悗锛堣溅灏撅級鏄礋鍊�
- double excessX = 0D;
+ double yMax = footprint.getHalfWidth(); // localY 鏂瑰悜锛� 宸︿晶涓烘
+ double yMin = -footprint.getHalfWidth(); // localY 鏂瑰悜锛� 鍙充晶涓鸿礋
+
+ // 涓夈�佽绠� 鐐� 鏄惁鍦� 鈥滅煩褰㈠鎵� + buffer 鐨勫尯鍩熲�濋噷
+ // 璁＄畻鐐硅窛绂� 鐭╁舰杈圭晫 鐨勨�樿秴鍑洪噺鈥欙紝钀藉湪鐭╁舰鍐呮椂瓒呭嚭閲忎负 0
+ double excessX = 0D; // 榛樿 0 琛ㄧず杩樺湪鐭╁舰閲岄潰
if (localX < xMin) {
excessX = xMin - localX;
} else if (localX > xMax) {
excessX = localX - xMax;
}
- double excessY = 0D;
+ double excessY = 0D; // 榛樿 0 琛ㄧず杩樺湪鐭╁舰閲岄潰
if (localY < yMin) {
excessY = yMin - localY;
} else if (localY > yMax) {
excessY = localY - yMax;
}
+ // (excessX, excessY) 琛ㄧず璺濈鍚戦噺
+
+ // 閫氳繃 娆ф皬璺濈骞虫柟绠楁硶锛� 鑻ュ埌鐭╁舰鐨勬渶鐭窛绂讳笉瓒呰繃 buffer锛岃鏄庡湪鈥滆溅杈嗗舰鐘� + 缂撳啿鍗婂緞鈥濆唴
return excessX * excessX + excessY * excessY <= buffer * buffer;
}
--
Gitblit v1.9.1