From 0e7e7a9317894a0bac09e1cb83c9be628e8b4ca5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 21 七月 2023 16:53:13 +0800
Subject: [PATCH] 计算中间点到目标点行走距离

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index c719605..8a750bd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -938,13 +938,13 @@
                 middlePath = nodes.get(nodes.size() - 3);
                 //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                 middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 3);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
             } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
                 //涓棿璺緞
                 middlePath = nodes.get(nodes.size() - 2);
                 //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                 middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 2);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
             }
 
             //鐩爣璺緞
@@ -1008,13 +1008,13 @@
                     middlePath = nodes.get(nodes.size() - 3);
                     //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                     middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                    middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                    middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 3);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
                 } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
                     //涓棿璺緞
                     middlePath = nodes.get(nodes.size() - 2);
                     //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                     middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                    middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                    middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 2);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
                 }
 
                 //鐩爣璺緞
@@ -1060,13 +1060,13 @@
                 middlePath = nodes.get(nodes.size() - 3);
                 //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                 middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 3);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
             } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
                 //涓棿璺緞
                 middlePath = nodes.get(nodes.size() - 2);
                 //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
                 middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
-                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+                middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 2);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
             }
 
             //鐩爣璺緞

--
Gitblit v1.9.1