From d6335a2f0540388ab1844fc42d1f770b26c85b6f Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期二, 01 八月 2023 13:27:11 +0800 Subject: [PATCH] 将行走节点添加到每一步移动命令中 --- src/main/java/com/zy/core/model/command/NyShuttleHttpCommand.java | 8 ++++++++ src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java | 1 + src/main/java/com/zy/core/thread/NyShuttleThread.java | 1 + 3 files changed, 10 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 f5e4876..bd0d0e6 100644 --- a/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java +++ b/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java @@ -77,6 +77,7 @@ NavigateNode targetPath = nodes.get(nodes.size() - 1); //鑾峰彇绉诲姩鍛戒护 NyShuttleHttpCommand moveCommand = NyHttpUtils.getMoveCommand(shuttleNo, wrkNo, startPath, targetPath); + moveCommand.setNodes(nodes);//灏嗚璧拌妭鐐规坊鍔犲埌姣忎竴姝ュ懡浠や腑 commands.add(moveCommand); } diff --git a/src/main/java/com/zy/core/model/command/NyShuttleHttpCommand.java b/src/main/java/com/zy/core/model/command/NyShuttleHttpCommand.java index e7ffc1e..50cbb35 100644 --- a/src/main/java/com/zy/core/model/command/NyShuttleHttpCommand.java +++ b/src/main/java/com/zy/core/model/command/NyShuttleHttpCommand.java @@ -1,6 +1,9 @@ package com.zy.core.model.command; +import com.zy.common.model.NavigateNode; import lombok.Data; + +import java.util.List; import java.util.Map; @Data @@ -41,5 +44,10 @@ */ private Boolean complete = false; + /** + * 琛岃蛋鍛戒护鎵�鍗犵敤鐨勮妭鐐筶ist + */ + private List<NavigateNode> nodes; + } diff --git a/src/main/java/com/zy/core/thread/NyShuttleThread.java b/src/main/java/com/zy/core/thread/NyShuttleThread.java index f5c3500..ef2c24b 100644 --- a/src/main/java/com/zy/core/thread/NyShuttleThread.java +++ b/src/main/java/com/zy/core/thread/NyShuttleThread.java @@ -7,6 +7,7 @@ import com.zy.asrs.entity.*; import com.zy.asrs.service.*; +import com.zy.common.model.NavigateNode; import com.zy.common.utils.*; import com.zy.core.News; import com.zy.core.ThreadHandler; -- Gitblit v1.9.1