From 5f685f89bf6501325b6129ecf709b988369eeedd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 13 十月 2023 10:16:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateUtils.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index 846f8b4..c086759 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -4,7 +4,11 @@
import com.zy.common.model.MapNode;
import com.zy.common.model.NavigateNode;
import com.zy.common.model.enums.NavigationMapType;
+import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.ShuttleTaskModeType;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.protocol.NyShuttleProtocol;
+import com.zy.core.thread.NyShuttleThread;
import java.util.*;
@@ -222,9 +226,9 @@
/**
* 鑾峰彇涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
*/
- public static Integer getMiddleToDistDistance(List<NavigateNode> path, Integer distance) {
- //涓棿璺緞
- NavigateNode middlePath = path.get(path.size() - distance);
+ public static Integer getMiddleToDistDistance(List<NavigateNode> path, NavigateNode middlePath) {
+ //鏈�鍚庝竴鏉¤妭鐐逛笉璁＄畻杩涜璧拌窛绂�
+ NavigateNode lastPath = path.get(path.size() - 1);
//鎬昏窛绂�
int allDistance = 0;
boolean flag = false;
@@ -233,6 +237,10 @@
flag = true;
}
+ if (navigateNode.equals(lastPath)) {
+ continue;//鏈�鍚庝竴鏉¤妭鐐逛笉璁＄畻杩涜璧拌窛绂�
+ }
+
if (flag) {
allDistance += navigateNode.getMoveDistance();
}
@@ -240,6 +248,36 @@
return allDistance;
}
+ /**
+ * 妫�娴嬭矾寰勬槸鍚﹀彲鐢�(鍙蛋)
+ */
+ public static boolean checkPathIsAvailable(List<NavigateNode> path, Integer shuttleNo, Integer lev, List<int[]> whitePoints) {
+ NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
+ if (shuttleThread == null) {
+ return false;
+ }
+ NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ return false;
+ }
+
+ Integer mapType = NavigationMapType.DFX.id;
+ if (shuttleProtocol.getLiftPosition() == 1) {
+ //涓嬮檷浣嶇疆
+ mapType = NavigationMapType.NORMAL.id;
+ }
+
+ NavigateSolution solution = new NavigateSolution(mapType, lev, whitePoints, Utils.getShuttlePoints(shuttleNo, lev));//鑾峰彇鏃犵櫧鍚嶅崟鍦板浘(璇ュ湴鍥惧寘鍚皬杞﹀潗鏍�)
+ int[][] map = solution.map;
+ for (NavigateNode node : path) {
+ int value = map[node.getX()][node.getY()];
+ if (value != 0 && value != 3 && value != 5) {//姣嶈建閬�3銆佸瓙杞ㄩ亾0銆佸厖鐢垫々5
+ return false;
+ }
+ }
+ return true;
+ }
+
public static void main(String[] args) {
//璁＄畻璺緞
List<NavigateNode> calc = calc("1000901", "1800201", NavigationMapType.NONE.id, null);
--
Gitblit v1.9.1