From 3e546985f2d10ad8607b9e66b4fef71bedaab940 Mon Sep 17 00:00:00 2001 From: xuzhiheng <2543137953@qq.com> Date: Tue, 24 Jun 2025 20:21:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=B7=E6=B1=82=E7=82=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualvehicle/LoopbackCommunicationAdapter.java | 2 +- .../communication/http/dto/kc/action/RequestAction.java | 4 ++++ .../opentcs/communication/http/service/ExecuteAction.java | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/opentcs-commadapter-loopback/src/main/java/org/opentcs/virtualvehicle/LoopbackCommunicationAdapter.java b/opentcs-commadapter-loopback/src/main/java/org/opentcs/virtualvehicle/LoopbackCommunicationAdapter.java index c378a1e..f7597cd 100644 --- a/opentcs-commadapter-loopback/src/main/java/org/opentcs/virtualvehicle/LoopbackCommunicationAdapter.java +++ b/opentcs-commadapter-loopback/src/main/java/org/opentcs/virtualvehicle/LoopbackCommunicationAdapter.java @@ -471,7 +471,7 @@ public class LoopbackCommunicationAdapter ACTION_STATUS = true; //下发动作 - ExecuteAction.sendCmd(getProcessModel().getName(), command.getOperation(), getSerialNum()); + ExecuteAction.sendCmd(getProcessModel().getName(), getProcessModel().getPosition(), command.getOperation(), getSerialNum()); //进入阻塞 while (ACTION_STATUS) { diff --git a/opentcs-common/src/main/java/org/opentcs/communication/http/dto/kc/action/RequestAction.java b/opentcs-common/src/main/java/org/opentcs/communication/http/dto/kc/action/RequestAction.java index 1e96494..20b08db 100644 --- a/opentcs-common/src/main/java/org/opentcs/communication/http/dto/kc/action/RequestAction.java +++ b/opentcs-common/src/main/java/org/opentcs/communication/http/dto/kc/action/RequestAction.java @@ -12,5 +12,9 @@ public class RequestAction { * 动作 */ private String action; + /** + * 当前位置 + */ + private String point; } diff --git a/opentcs-common/src/main/java/org/opentcs/communication/http/service/ExecuteAction.java b/opentcs-common/src/main/java/org/opentcs/communication/http/service/ExecuteAction.java index 7c1f176..255d101 100644 --- a/opentcs-common/src/main/java/org/opentcs/communication/http/service/ExecuteAction.java +++ b/opentcs-common/src/main/java/org/opentcs/communication/http/service/ExecuteAction.java @@ -11,9 +11,12 @@ public class ExecuteAction extends BaseService { /** * 下发动作到平台 + * @param vehicleName 车辆名称 + * @param point 当前位置 * @param action 动作 + * @param serialNum 序列号 */ - public static void sendCmd(String vehicleName, String action, Integer serialNum) { + public static void sendCmd(String vehicleName, String point, String action, Integer serialNum) { String url = getUrl(vehicleName); @@ -24,6 +27,7 @@ public class ExecuteAction extends BaseService { RequestAction requestAction = new RequestAction(); requestAction.setAction(action); + requestAction.setPoint(point); BaseRequestTo baseRequestTo = new BaseRequestTo( 4,