From 4e1a8e484888b3d3f28dc9629904e6e54d90ebc5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 28 七月 2023 16:26:40 +0800
Subject: [PATCH] 穿梭车命令封装
---
src/main/java/com/zy/common/utils/NyHttpUtils.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NyHttpUtils.java b/src/main/java/com/zy/common/utils/NyHttpUtils.java
index 5c28076..fd22a84 100644
--- a/src/main/java/com/zy/common/utils/NyHttpUtils.java
+++ b/src/main/java/com/zy/common/utils/NyHttpUtils.java
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONObject;
import com.zy.common.model.NavigateNode;
import com.zy.core.model.command.NyShuttleHttpCommand;
+import com.zy.core.model.protocol.NyShuttleProtocol;
+
import java.util.*;
/**
@@ -52,8 +54,8 @@
HashMap<String, Object> body = new HashMap<>();
body.put("requestType", "move");//绉诲姩鍛戒护
body.put("taskId", wrkNo);//浠诲姟鍙�
- body.put("start", start);//璧风偣
- body.put("target", target);//缁堢偣
+ body.put("start", navigateNodeToPointNode(start));//璧风偣
+ body.put("target", navigateNodeToPointNode(target));//缁堢偣
request.setBody(body);
httpStandard.setRequest(request);
@@ -68,8 +70,8 @@
HashMap<String, Object> body = new HashMap<>();
body.put("requestType", in ? "intoLift" : "outLift");//杩涘嚭鎻愬崌鏈�
body.put("taskId", wrkNo);//浠诲姟鍙�
- body.put("start", start);//璧风偣
- body.put("target", target);//缁堢偣
+ body.put("start", navigateNodeToPointNode(start));//璧风偣
+ body.put("target", navigateNodeToPointNode(target));//缁堢偣
request.setBody(body);
httpStandard.setRequest(request);
@@ -294,4 +296,13 @@
return null;
}
+ //鍦板浘鑺傜偣杞崲鏅�氳妭鐐箈yz
+ public static NyShuttleProtocol.NyShuttlePointClass navigateNodeToPointNode(NavigateNode node) {
+ NyShuttleProtocol.NyShuttlePointClass point = new NyShuttleProtocol.NyShuttlePointClass();
+ point.setX(node.getX());
+ point.setY(node.getY());
+ point.setZ(node.getZ());
+ return point;
+ }
+
}
--
Gitblit v1.9.1