From 720857266a5d45135c729962fede3b366e95e0b3 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 26 三月 2025 10:22:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 5f90eb4..ce3f72e 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -194,7 +194,7 @@
}
JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
- if (!socketResults.isEmpty() && socketResults.size() >= 5) {
+ if (!socketResults.isEmpty() && socketResults.size() >= 20) {
socketResults.remove(0);//娓呯悊澶磋妭鐐�
}
socketResults.add(result);//娣诲姞鏁版嵁
@@ -203,7 +203,7 @@
}
}
- public JSONObject getRequestBody(String type) {
+ public JSONObject getRequestBody(String type, String taskId) {
try {
// 鑾峰彇鏈嶅姟鍣ㄥ搷搴�
JSONObject result = null;
@@ -226,7 +226,14 @@
}
if (!responseType.equals(type)) {
- continue;//鍝嶅簲ID涓庤姹侷D涓嶄竴鑷达紝涓嶅湪璋冭瘯妯″紡涓�
+ continue;//鍝嶅簲绫诲瀷涓庤姹傜被鍨嬩笉涓�鑷达紝涓嶅湪璋冭瘯妯″紡涓�
+ }
+
+ if (taskId != null) {
+ String responseTaskId = resultBody.get("taskId").toString();
+ if (!responseTaskId.equals(taskId)) {
+ continue;//鍝嶅簲ID涓庤姹侷D涓嶄竴鑷达紝涓嶅湪璋冭瘯妯″紡涓�
+ }
}
result = socketResult;
@@ -395,7 +402,7 @@
socketResults.remove(removeIdx);
}
} catch (Exception e) {
-// e.printStackTrace();
+ e.printStackTrace();
}
}
@@ -459,18 +466,14 @@
for (NyShuttleHttpCommand requestCommand : commandList) {
while (true) {
- int i = 0;
- i++;
JSONObject result = requestCommand(requestCommand);
if (result == null) {
// return response;//璇锋眰澶辫触
- News.info("Socket鍛戒护涓嬪彂澶辫触锛屼换鍔℃暟鎹�={}锛屾鏁�={}", JSON.toJSON(command), i);
continue;//璇锋眰澶辫触灏濊瘯閲嶆柊璇锋眰
}
this.shuttleProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿
response.setMessage(JSON.toJSONString(result));
response.setResult(true);
- News.info("Socket鍛戒护涓嬪彂鎴愬姛锛屼换鍔℃暟鎹�={}锛屾鏁�={}", JSON.toJSON(command), i);
break;
}
}
@@ -1079,17 +1082,20 @@
// System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
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;
+// return null;
+ //taskId鍙兘鍙栫┖锛屼笉鎶ラ敊锛屾甯告儏鍐�
}
// 鑾峰彇鏈嶅姟鍣ㄥ搷搴�
// 灏濊瘯100娆�
JSONObject result = null;
for (int i = 0; i < 100; i++) {
- result = getRequestBody(requestType);
+ result = getRequestBody(requestType, taskId);
if (result == null) {
try {
Thread.sleep(100);
--
Gitblit v1.9.1