From c05fc7d74a7f706686b2fc6735ebd98459996903 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 三月 2023 14:47:29 +0800
Subject: [PATCH] 四向穿梭车主线程完成操作
---
src/main/java/com/zy/common/utils/NavigateUtils.java | 11 ++++++++---
1 files changed, 8 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 d53077d..fd743d4 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -1,6 +1,7 @@
package com.zy.common.utils;
import com.zy.common.model.NavigateNode;
+import com.zy.core.enums.ShuttleTaskModeType;
import java.util.*;
@@ -9,7 +10,7 @@
*/
public class NavigateUtils {
- public static List<NavigateNode> calc(String startPoint, String endPoint, String mapType) {
+ public static List<NavigateNode> calc(String startPoint, String endPoint, Integer mapType) {
//閫氳繃寮�濮嬬紪鍙峰拰缁撴潫缂栧彿鑾峰彇瀵瑰簲鐨剎y杞村潗鏍�
int[] startArr = NavigatePositionConvert.positionToXY(startPoint);//寮�濮嬭妭鐐�
int[] endArr = NavigatePositionConvert.positionToXY(endPoint);//缁撴潫鑺傜偣
@@ -31,7 +32,6 @@
//娓叉煋
NavigateNode fatherNode = null;//褰撳墠寰幆涓婁竴鑺傜偣锛岀敤浜庢嫄鐐硅绠�
while (res_node != null) {
- HashMap<String, Object> data = new HashMap<>();
res_node.setDirection(null);
res_node.setIsInflectionPoint(false);
@@ -127,6 +127,7 @@
public static ArrayList<ArrayList<NavigateNode>> getSectionPath(List<NavigateNode> mapList) {
ArrayList<ArrayList<NavigateNode>> list = new ArrayList<>();
ArrayList<NavigateNode> data = new ArrayList<>();
+ String direction = mapList.get(0).getDirection();//琛岃蛋鏂瑰悜
for (NavigateNode mapNode : mapList) {
boolean isInflectionPoint = mapNode.getIsInflectionPoint();
data.add(mapNode);
@@ -134,7 +135,11 @@
//鎷愮偣
//鍒嗗壊鏁版嵁
list.add(data);//娣诲姞鏌愪竴娈垫暟鎹�
+ direction = mapNode.getDirection();//鏇存柊琛岃蛋鏂瑰悜
data = new ArrayList<>();
+ }else {
+ //鐩磋绾胯矾
+ mapNode.setDirection(direction);//璁剧疆琛岃蛋鏂瑰悜
}
}
@@ -146,7 +151,7 @@
public static void main(String[] args) {
//璁＄畻璺緞
- List<NavigateNode> calc = calc("1000901", "0201801", "out");
+ List<NavigateNode> calc = calc("1000901", "0201801", ShuttleTaskModeType.PAK_OUT.id);
System.out.println(calc);
System.out.println("------------------------");
// List<NavigateNode> calc = calc("0501401", "0201801", "out");
--
Gitblit v1.9.1