From 11b28c7a6c5f0882b8385a370b20919c6246fc1d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 10 五月 2023 08:05:24 +0800
Subject: [PATCH] 工作完成时状态码变更
---
src/main/java/com/zy/common/utils/NavigateUtils.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index 4be9c78..ea1a70e 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.alibaba.fastjson.JSONObject;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.NavigateNode;
import com.zy.core.enums.ShuttleTaskModeType;
@@ -15,6 +16,9 @@
//閫氳繃寮�濮嬬紪鍙峰拰缁撴潫缂栧彿鑾峰彇瀵瑰簲鐨剎y杞村潗鏍�
int[] startArr = NavigatePositionConvert.positionToXY(startPoint);//寮�濮嬭妭鐐�
int[] endArr = NavigatePositionConvert.positionToXY(endPoint);//缁撴潫鑺傜偣
+
+ //鑾峰彇褰撳墠鑺傜偣璁＄畻鐨勫眰楂橈紝骞惰祴鍊煎埌姣忎竴涓妭鐐逛腑
+ int lev = Utils.getLev(startPoint);
//鍒濆鍖栧紑濮嬭妭鐐�
NavigateNode start = new NavigateNode(startArr[0], startArr[1]);
@@ -35,6 +39,7 @@
while (res_node != null) {
res_node.setDirection(null);
res_node.setIsInflectionPoint(false);
+ res_node.setZ(lev);//璁剧疆灞傞珮
//瀵绘壘鎷愮偣
HashMap<String, Object> result = searchInflectionPoint(res_node, fatherNode, res_node.getFather());//鍒嗗埆浼犲叆褰撳墠鑺傜偣銆佺埗鑺傜偣銆佷笅涓�鑺傜偣
@@ -129,7 +134,9 @@
ArrayList<ArrayList<NavigateNode>> list = new ArrayList<>();
ArrayList<NavigateNode> data = new ArrayList<>();
String direction = mapList.get(0).getDirection();//琛岃蛋鏂瑰悜
- for (NavigateNode mapNode : mapList) {
+
+ for (int i = 0; i < mapList.size(); i++) {
+ NavigateNode mapNode = mapList.get(i);
boolean isInflectionPoint = mapNode.getIsInflectionPoint();
data.add(mapNode);
if (isInflectionPoint) {
@@ -138,6 +145,7 @@
list.add(data);//娣诲姞鏌愪竴娈垫暟鎹�
direction = mapNode.getDirection();//鏇存柊琛岃蛋鏂瑰悜
data = new ArrayList<>();
+ data.add(mapNode);//灏嗘嫄鐐圭殑缁堢偣锛屾洿鏂版垚涓嬩竴娈靛懡浠ょ殑璧风偣鍧愭爣
}else {
//鐩磋绾胯矾
mapNode.setDirection(direction);//璁剧疆琛岃蛋鏂瑰悜
@@ -169,7 +177,7 @@
/**
* 鑾峰彇褰撳墠璺緞鎬昏璧拌窛绂�
*/
- public static Integer getCurrentPathAllDistance(ArrayList<NavigateNode> path) {
+ public static Integer getCurrentPathAllDistance(List<NavigateNode> path) {
if (path.size() == 1) {
//璺緞鍙湁涓�鏉℃暟鎹紝鍒欑洿鎺ヨ繑鍥炶璧拌窛绂�
return path.get(0).getMoveDistance();
--
Gitblit v1.9.1