From 629959675a97b4d41c1c36eaa60ee1671c224e93 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 13 八月 2025 09:12:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index e311708..aba6db6 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -977,8 +977,64 @@
HashMap<String, Object> body = new HashMap<>();
body.put("requestType", "move");//绉诲姩鍛戒护
body.put("taskId", taskId);//TaskID闇�瑕侀殢鏈�
-// body.put("start", navigateNodeToNyPointNode(NavigatePositionConvert.codeToNode(startCodeNum, device.getHostId())));//璧风偣
-// body.put("target", navigateNodeToNyPointNode(NavigatePositionConvert.codeToNode(distCodeNum, device.getHostId())));//缁堢偣
+ body.put("path", path);
+ request.setBody(body);
+
+ NavigateNode startNode = nodes.get(0);
+ for (NavigateNode node : nodes) {
+ HashMap<String, Object> data = new HashMap<>();
+ String codeNum = NavigatePositionConvert.xyToPosition(node.getX(), node.getY(), node.getZ());
+ Map<String, Object> nyNode = navigateNodeToNyPointNode(NavigatePositionConvert.codeToNode(codeNum));
+ int xp = Integer.parseInt(String.valueOf(nyNode.get("y")));
+ int yp = Integer.parseInt(String.valueOf(nyNode.get("x")));
+ int z = Integer.parseInt(String.valueOf(nyNode.get("z")));
+
+ List<List<MapNode>> mapData = navigateMapData.getJsonData(startNode.getZ(), NavigationMapType.getMapTypes(NavigationMapType.NONE), null, null);
+ List<MapNode> mapNodes = mapData.get(node.getX());
+ MapNode mapNode = mapNodes.get(node.getY());
+
+ data.put("xp", xp);
+ data.put("yp", yp);
+ data.put("z", z);
+ data.put("x", mapNode.getXBase());
+ data.put("y", mapNode.getYBase());
+ path.add(data);
+ }
+
+ httpStandard.setRequest(request);
+
+ LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("qr_code_value", distCodeNum));
+ if (locMast == null) {
+ throw new CoolException("搴撲綅淇℃伅涓嶅瓨鍦�");
+ }
+
+ ShuttleCommand command = new ShuttleCommand();
+ command.setShuttleNo(deviceConfig.getDeviceNo());
+ command.setBody(JSON.toJSONString(httpStandard));
+ command.setMode(ShuttleCommandModeType.MOVE.id);
+ command.setTargetLocNo(locMast.getLocNo());
+ command.setTaskNo(taskId);
+ return command;
+ }
+
+ @Override
+ public ShuttleCommand getMoveLiftCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed, List<NavigateNode> nodes, Boolean moveIn) {
+ NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
+ NyShuttleHttpCommand httpStandard = getHttpStandard(deviceConfig.getDeviceNo(), taskNo);
+ NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest();
+
+ ArrayList<HashMap<String, Object>> path = new ArrayList<>();
+
+ Integer taskId = getTaskId();
+ HashMap<String, Object> body = new HashMap<>();
+ if (moveIn) {
+ body.put("requestType", "intoLift");//杩涙彁鍗囨満
+ }else {
+ body.put("requestType", "outLift");//鍑烘彁鍗囨満
+ }
+ body.put("taskId", taskId);//TaskID闇�瑕侀殢鏈�
body.put("path", path);
request.setBody(body);
--
Gitblit v1.9.1