From c8ca14407cd83d0e03fb017ad97c0464bd0c42c4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 18 三月 2025 10:46:28 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 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 31abb43..d7dfba6 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -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;
@@ -1075,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鍙兘鍙栫┖锛屼笉鎶ラ敊锛屾甯告儏鍐�
         }
 
         // 鑾峰彇鏈嶅姟鍣ㄥ搷搴�
-        // 灏濊瘯10娆�
+        // 灏濊瘯100娆�
         JSONObject result = null;
-        for (int i = 0; i < 10; i++) {
-            result = getRequestBody(requestType);
+        for (int i = 0; i < 100; i++) {
+            result = getRequestBody(requestType, taskId);
             if (result == null) {
                 try {
                     Thread.sleep(100);

--
Gitblit v1.9.1