From 56a19be6c03e729b112bf8197960d7cc4d9d498e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 24 七月 2023 09:06:04 +0800
Subject: [PATCH] 行走距离
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 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 8a750bd..cc5cfa6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -935,16 +935,16 @@
Integer middleToDistDistance = null;//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
if (nodes.size() > 10) {//涓鐮佷紶鍊掓暟绗笁涓�
//涓棿璺緞
- middlePath = nodes.get(nodes.size() - 3);
- //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
- middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
- 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, 2);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
+ //涓棿璺緞
+ middlePath = nodes.get(nodes.size() - 1);
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
}
//鐩爣璺緞
@@ -1005,16 +1005,16 @@
Integer middleToDistDistance = null;//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
if (nodes.size() > 10) {//涓鐮佷紶鍊掓暟绗笁涓�
//涓棿璺緞
- middlePath = nodes.get(nodes.size() - 3);
- //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
- middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
- 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, 2);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
+ //涓棿璺緞
+ middlePath = nodes.get(nodes.size() - 1);
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
}
//鐩爣璺緞
@@ -1057,16 +1057,16 @@
Integer middleToDistDistance = null;//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
if (nodes.size() > 10) {//涓鐮佷紶鍊掓暟绗笁涓�
//涓棿璺緞
- middlePath = nodes.get(nodes.size() - 3);
- //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
- middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
- 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, 2);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
+ //涓棿璺緞
+ middlePath = nodes.get(nodes.size() - 1);
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
}
//鐩爣璺緞
--
Gitblit v1.9.1