From 9af70943c966b0c74dcd735217ff18c9d7564221 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 08 七月 2025 16:47:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 198 +++++++++++++++++++++++++------------------------
1 files changed, 101 insertions(+), 97 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 c375106..166c711 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -265,10 +265,10 @@
}
NyShuttleHttpCommand readStatusCommand = getReadStatusCommand(deviceConfig.getDeviceNo());
- //鎸囦护瓒呰繃浜旀潯锛屼笉鍐嶄笅鍙戜换鍔＄姸鎬佽姹�
+ //鎸囦护瓒呰繃2鏉★紝涓嶅啀涓嬪彂浠诲姟鐘舵�佽姹�
TreeSet<String> deviceCommandMsgListKey = deviceMsgUtils.getDeviceCommandMsgListKey(SlaveType.Shuttle, deviceConfig.getDeviceNo());
- if (deviceCommandMsgListKey.size() < 5) {
- requestCommandAsync(readStatusCommand);//璇锋眰鐘舵��
+ if (deviceCommandMsgListKey.size() < 2) {
+ requestCommand(readStatusCommand);//璇锋眰鐘舵��
}
if (this.socketReadResults.isEmpty()) {
@@ -382,7 +382,7 @@
ShuttleCommand initCommand = getInitCommand(requestId, code);
//鍙戝嚭璇锋眰
NyShuttleHttpCommand httpCommand = JSON.parseObject(initCommand.getBody(), NyShuttleHttpCommand.class);
- JSONObject requestResult = requestCommand(httpCommand);
+ requestCommand(httpCommand);
log.info(MessageFormat.format("銆恵0}銆戝洓鍚戣溅澶嶄綅涓婃姤 ===>> [code:{1}] [ip:{2}] [port:{3}]", deviceConfig.getDeviceNo(), code, deviceConfig.getIp(), deviceConfig.getPort()));
OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆戝洓鍚戣溅澶嶄綅涓婃姤 ===>> [code:{1}] [ip:{2}] [port:{3}]", deviceConfig.getDeviceNo(), code, deviceConfig.getIp(), deviceConfig.getPort()));
@@ -413,58 +413,81 @@
return response;
}
+// @Override
+// public CommandResponse move(ShuttleCommand command) {
+// CommandResponse response = new CommandResponse(false);
+// try {
+// //鍙戝嚭璇锋眰
+// NyShuttleHttpCommand httpCommand = JSON.parseObject(command.getBody(), NyShuttleHttpCommand.class);
+// Map<String, Object> body = httpCommand.getRequest().getBody();
+// Object pathObj = body.get("path");
+// int taskId = Integer.parseInt(body.get("taskId").toString());
+// List<JSONObject> path = JSON.parseArray(JSON.toJSONString(pathObj), JSONObject.class);
+// ArrayList<NyShuttleHttpCommand> commandList = new ArrayList<>();
+// while (!path.isEmpty()) {
+// ArrayList<Map<String, Object>> list = new ArrayList<>();
+// if (path.size() > 10) {
+// List<JSONObject> subList = path.subList(0, 10);
+// list.addAll(subList);
+//
+// List<JSONObject> tmp = new ArrayList<>();
+// for (int i = 10; i < path.size(); i++) {
+// tmp.add(path.get(i));
+// }
+// path = tmp;
+// }else {
+// list.addAll(path);
+// path.clear();
+// }
+//
+// NyShuttleHttpCommand httpCommandCopy = JSON.parseObject(JSON.toJSONString(httpCommand), NyShuttleHttpCommand.class);
+// JSONObject bodyCopy = JSON.parseObject(JSON.toJSONString(body));
+//
+// NyShuttleHttpCommand.NyRequest request = httpCommandCopy.getRequest();
+// bodyCopy.put("path", list);
+// bodyCopy.put("taskId", taskId++);
+// request.setBody(bodyCopy);
+// httpCommandCopy.setRequest(request);
+//
+// commandList.add(httpCommandCopy);//add copy
+// }
+//
+// for (NyShuttleHttpCommand requestCommand : commandList) {
+// while (true) {
+// JSONObject result = requestCommand(requestCommand);
+// if (result == null) {
+//// return response;//璇锋眰澶辫触
+// continue;//璇锋眰澶辫触灏濊瘯閲嶆柊璇锋眰
+// }
+// this.shuttleProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿
+// response.setMessage(JSON.toJSONString(result));
+// response.setResult(true);
+// break;
+// }
+// }
+// return response;
+// } catch (Exception e) {
+// e.printStackTrace();
+// response.setMessage(e.getMessage());
+// return response;
+// }
+// }
+
@Override
public CommandResponse move(ShuttleCommand command) {
CommandResponse response = new CommandResponse(false);
try {
//鍙戝嚭璇锋眰
NyShuttleHttpCommand httpCommand = JSON.parseObject(command.getBody(), NyShuttleHttpCommand.class);
- Map<String, Object> body = httpCommand.getRequest().getBody();
- Object pathObj = body.get("path");
- int taskId = Integer.parseInt(body.get("taskId").toString());
- List<JSONObject> path = JSON.parseArray(JSON.toJSONString(pathObj), JSONObject.class);
- ArrayList<NyShuttleHttpCommand> commandList = new ArrayList<>();
- while (!path.isEmpty()) {
- ArrayList<Map<String, Object>> list = new ArrayList<>();
- if (path.size() > 10) {
- List<JSONObject> subList = path.subList(0, 10);
- list.addAll(subList);
-
- List<JSONObject> tmp = new ArrayList<>();
- for (int i = 10; i < path.size(); i++) {
- tmp.add(path.get(i));
- }
- path = tmp;
- }else {
- list.addAll(path);
- path.clear();
- }
-
- NyShuttleHttpCommand httpCommandCopy = JSON.parseObject(JSON.toJSONString(httpCommand), NyShuttleHttpCommand.class);
- JSONObject bodyCopy = JSON.parseObject(JSON.toJSONString(body));
-
- NyShuttleHttpCommand.NyRequest request = httpCommandCopy.getRequest();
- bodyCopy.put("path", list);
- bodyCopy.put("taskId", taskId++);
- request.setBody(bodyCopy);
- httpCommandCopy.setRequest(request);
-
- commandList.add(httpCommandCopy);//add copy
+ JSONObject requestToken = requestCommand(httpCommand);
+ //鏌ヨ璇锋眰缁撴灉
+ JSONObject result = queryCommandStatus(requestToken.getString("requestType"), requestToken.getString("taskId"));
+ if (result == null) {
+ return response;//璇锋眰澶辫触
}
-
- for (NyShuttleHttpCommand requestCommand : commandList) {
- while (true) {
- JSONObject result = requestCommand(requestCommand);
- if (result == null) {
-// return response;//璇锋眰澶辫触
- continue;//璇锋眰澶辫触灏濊瘯閲嶆柊璇锋眰
- }
- this.shuttleProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿
- response.setMessage(JSON.toJSONString(result));
- response.setResult(true);
- break;
- }
- }
+ this.shuttleProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿
+ response.setMessage(JSON.toJSONString(result));
+ response.setResult(true);
return response;
} catch (Exception e) {
e.printStackTrace();
@@ -479,7 +502,9 @@
try {
//鍙戝嚭璇锋眰
NyShuttleHttpCommand httpCommand = JSON.parseObject(command.getBody(), NyShuttleHttpCommand.class);
- JSONObject result = requestCommand(httpCommand);
+ JSONObject requestToken = requestCommand(httpCommand);
+ //鏌ヨ璇锋眰缁撴灉
+ JSONObject result = queryCommandStatus(requestToken.getString("requestType"), requestToken.getString("taskId"));
if (result == null) {
return response;//璇锋眰澶辫触
}
@@ -499,7 +524,9 @@
try {
//鍙戝嚭璇锋眰
NyShuttleHttpCommand httpCommand = JSON.parseObject(command.getBody(), NyShuttleHttpCommand.class);
- JSONObject result = requestCommand(httpCommand);
+ JSONObject requestToken = requestCommand(httpCommand);
+ //鏌ヨ璇锋眰缁撴灉
+ JSONObject result = queryCommandStatus(requestToken.getString("requestType"), requestToken.getString("taskId"));
if (result == null) {
return response;//璇锋眰澶辫触
}
@@ -527,7 +554,9 @@
try {
//鍙戝嚭璇锋眰
NyShuttleHttpCommand httpCommand = JSON.parseObject(command.getBody(), NyShuttleHttpCommand.class);
- JSONObject result = requestCommand(httpCommand);
+ JSONObject requestToken = requestCommand(httpCommand);
+ //鏌ヨ璇锋眰缁撴灉
+ JSONObject result = queryCommandStatus(requestToken.getString("requestType"), requestToken.getString("taskId"));
if (result == null) {
return response;//璇锋眰澶辫触
}
@@ -1097,7 +1126,7 @@
return httpStandard;
}
- //鍙戝嚭璇锋眰-鍚屾
+ //鍙戝嚭璇锋眰
private JSONObject requestCommand(NyShuttleHttpCommand httpCommand) throws IOException {
try {
DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
@@ -1125,58 +1154,33 @@
//taskId鍙兘鍙栫┖锛屼笉鎶ラ敊锛屾甯告儏鍐�
}
- // 鑾峰彇鏈嶅姟鍣ㄥ搷搴�
- // 灏濊瘯30娆�
- JSONObject result = null;
- for (int i = 0; i < 30; i++) {
- result = getRequestBody(requestType, taskId);
- if (result == null) {
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }else {
- break;
- }
- }
- return result;//杩斿洖Body缁撴灉闆�
+ JSONObject result = new JSONObject();
+ result.put("requestType", requestType);
+ result.put("taskId", taskId);
+ return result;
}catch (Exception e) {
e.printStackTrace();
}
return null;
}
- //鍙戝嚭璇锋眰-绉绘
- private void requestCommandAsync(NyShuttleHttpCommand httpCommand) throws IOException {
- try {
- DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
- if (deviceMsgUtils == null) {
- return;
+ private JSONObject queryCommandStatus(String requestType, String taskId) {
+ // 鑾峰彇鏈嶅姟鍣ㄥ搷搴�
+ // 灏濊瘯50娆�
+ JSONObject result = null;
+ for (int i = 0; i < 50; i++) {
+ result = getRequestBody(requestType, taskId);
+ if (result == null) {
+ try {
+ Thread.sleep(500);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }else {
+ break;
}
-
- //鍘嬬缉鏁版嵁鍖�
- JSONObject data = JSON.parseObject(JSON.toJSONString(httpCommand));
- data.remove("nodes");
-
- DeviceCommandMsgModel commandMsgModel = new DeviceCommandMsgModel();
- commandMsgModel.setDeviceId(deviceConfig.getDeviceNo());
- commandMsgModel.setDeviceType(String.valueOf(SlaveType.Shuttle));
- commandMsgModel.setCommand(data);
- String key = deviceMsgUtils.sendDeviceCommand(SlaveType.Shuttle, deviceConfig.getDeviceNo(), commandMsgModel);
-
- String requestType = null;
- String taskId = null;
- try {
- requestType = httpCommand.getRequest().getBody().get("requestType").toString();
- taskId = httpCommand.getRequest().getBody().get("taskId").toString();
- } catch (Exception e) {
-// return null;
- //taskId鍙兘鍙栫┖锛屼笉鎶ラ敊锛屾甯告儏鍐�
- }
- }catch (Exception e) {
- e.printStackTrace();
}
+ return result;
}
private JSONObject filterBodyData(JSONObject data) {
--
Gitblit v1.9.1