From d13a01d1769f29b336e5b9f8612c6d41aaabbbb1 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 22 十一月 2024 20:42:20 +0800 Subject: [PATCH] #读取地图文件优化 --- src/main/java/com/zy/common/utils/NyHttpUtils.java | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/common/utils/NyHttpUtils.java b/src/main/java/com/zy/common/utils/NyHttpUtils.java index 3391a79..5727eed 100644 --- a/src/main/java/com/zy/common/utils/NyHttpUtils.java +++ b/src/main/java/com/zy/common/utils/NyHttpUtils.java @@ -71,11 +71,27 @@ NyShuttleHttpCommand httpStandard = getHttpStandard(shuttleNo, wrkNo); NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest(); + NyShuttleProtocol.NyShuttlePointClass nyStartPoint = new NyShuttleProtocol.NyShuttlePointClass(); + NyShuttleProtocol.NyShuttlePointClass nyTargetPoint = new NyShuttleProtocol.NyShuttlePointClass(); + if (in) { + //杩涙彁鍗囨満 + nyStartPoint = navigateNodeToNyPointNode(start); + nyTargetPoint.setX(target.getX()); + nyTargetPoint.setY(target.getY()); + nyTargetPoint.setZ(target.getZ()); + }else { + //鍑烘彁鍗囨満 + nyTargetPoint = navigateNodeToNyPointNode(target); + nyStartPoint.setX(start.getX()); + nyStartPoint.setY(start.getY()); + nyStartPoint.setZ(start.getZ()); + } + HashMap<String, Object> body = new HashMap<>(); body.put("requestType", in ? "intoLift" : "outLift");//杩涘嚭鎻愬崌鏈� body.put("taskId", getTaskId());//TaskID闇�瑕侀殢鏈� - body.put("start", navigateNodeToNyPointNode(start));//璧风偣 - body.put("target", navigateNodeToNyPointNode(target));//缁堢偣 + body.put("start", nyStartPoint);//璧风偣 + body.put("target", nyTargetPoint);//缁堢偣 request.setBody(body); httpStandard.setRequest(request); @@ -125,8 +141,8 @@ } //鑾峰彇鏇存柊灞傚潗鏍嘮(妤煎眰)鍛戒护 - public static NyShuttleHttpCommand getUpdateZCommand(Integer shuttleNo, Integer z) { - NyShuttleHttpCommand httpStandard = getHttpStandard(shuttleNo, 9999); + public static NyShuttleHttpCommand getUpdateZCommand(Integer shuttleNo, Integer z, Integer wrkNo) { + NyShuttleHttpCommand httpStandard = getHttpStandard(shuttleNo, wrkNo); NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest(); HashMap<String, Object> body = new HashMap<>(); @@ -285,26 +301,29 @@ if (socket == null) { return null; } + + //鍘嬬缉鏁版嵁鍖� + JSONObject data = JSON.parseObject(JSON.toJSONString(httpCommand)); + data.remove("nodes"); + // 鑾峰彇杈撳叆娴佸拰杈撳嚭娴� BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream())); OutputStreamWriter writer = new OutputStreamWriter(socket.getOutputStream()); - writer.write(JSON.toJSONString(httpCommand) + "\r\n"); + writer.write(JSON.toJSONString(data) + "\r\n"); writer.flush(); // System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand)); // 璇诲彇鏈嶅姟鍣ㄧ殑鍝嶅簲 StringBuffer sb = new StringBuffer(); - String response = null; char[] chars = new char[2048];//缂撳啿鍖� - do { + while (true) { reader.read(chars); - String trim = new String(chars).trim(); + String trim = new String(chars); sb.append(trim); - if (sb.lastIndexOf("\r\n") != -1) { + if (trim.lastIndexOf("\r\n") != -1) { break; } - } while (response != null); -// System.out.println("Received response from server: " + sb); + } JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆� if (!result.get("msgType").equals("responseMsg")) {//涓嶆槸鍝嶅簲鍐呭 -- Gitblit v1.9.1