From 7a3b50af32dce3c806a6e520043a714594f3acff Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期三, 25 十月 2023 19:59:26 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java b/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java index cf52c25..2c46cd8 100644 --- a/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java +++ b/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java @@ -1,5 +1,6 @@ package com.zy.common.utils; +import com.core.common.SpringUtils; import com.zy.asrs.utils.Utils; import com.zy.common.model.NavigateNode; import com.zy.common.model.NyShuttleOperaResult; @@ -86,6 +87,7 @@ * 鑾峰彇璧风偣鍒扮洰鏍囩偣琛岃蛋鍛戒护 */ public static NyShuttleOperaResult getStartToTargetCommands(Integer shuttleNo, Integer wrkNo, String startPoint, String targetPoint, Integer mapType) { + NavigateMapUtils navigateMapUtils = SpringUtils.getBean(NavigateMapUtils.class); //璁$畻璧风偣鍒扮洰鏍囩偣琛岃蛋鑺傜偣 List<NavigateNode> calc = NavigateUtils.calc(startPoint, targetPoint, mapType, Utils.getShuttlePoints(shuttleNo, Utils.getLev(startPoint))); if (calc == null) { @@ -94,6 +96,7 @@ //鍛戒护闆嗗悎 ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>(); + List<NavigateNode> allNode = new ArrayList<>(); //鑾峰彇鍒嗘璺緞 ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(calc); @@ -107,8 +110,11 @@ NyShuttleHttpCommand moveCommand = NyHttpUtils.getMoveCommand(shuttleNo, wrkNo, startPath, targetPath); moveCommand.setNodes(nodes);//灏嗚璧拌妭鐐规坊鍔犲埌姣忎竴姝ュ懡浠や腑 commands.add(moveCommand); + + allNode.addAll(nodes); } + navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(startPoint), allNode, true);//閿佸畾璺緞 return result(commands, calc); } -- Gitblit v1.9.1