From d51e29f60353ba3941489aed453997ee423c7bd5 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 29 三月 2025 10:38:36 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java |   77 +++++++++++++++++++++++++++++++++++---
 1 files changed, 70 insertions(+), 7 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..12c8cef 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -57,6 +57,7 @@
 
     private static final boolean DEBUG = false;//璋冭瘯妯″紡
 
+    private List<JSONObject> socketReadResults = new ArrayList<>();
     private List<JSONObject> socketResults = new ArrayList<>();
 
     //鍘熷璁惧鏁版嵁
@@ -194,7 +195,19 @@
             }
 
             JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
-            if (!socketResults.isEmpty() && socketResults.size() >= 5) {
+
+            String msgType = result.getString("msgType");
+            if ("responseMsg".equals(msgType)) {
+                JSONObject response = result.getJSONObject("response");
+                JSONObject body = response.getJSONObject("body");
+                if (body.containsKey("workingMode")) {
+                    //read
+                    socketReadResults.add(body);
+                    return;
+                }
+            }
+
+            if (!socketResults.isEmpty() && socketResults.size() >= 20) {
                 socketResults.remove(0);//娓呯悊澶磋妭鐐�
             }
             socketResults.add(result);//娣诲姞鏁版嵁
@@ -203,7 +216,7 @@
         }
     }
 
-    public JSONObject getRequestBody(String type) {
+    public JSONObject getRequestBody(String type, String taskId) {
         try {
             // 鑾峰彇鏈嶅姟鍣ㄥ搷搴�
             JSONObject result = null;
@@ -226,7 +239,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;
@@ -269,7 +289,14 @@
 
             //----------璇诲彇鍥涘悜绌挎杞︾姸鎬�-----------
             NyShuttleHttpCommand readStatusCommand = getReadStatusCommand(slave.getId());
-            JSONObject data = requestCommand(readStatusCommand);
+            requestCommandAsync(readStatusCommand);//璇锋眰鐘舵��
+
+            if (this.socketReadResults.isEmpty()) {
+                return;
+            }
+
+            JSONObject data = this.socketReadResults.get(0);
+            this.socketReadResults.remove(0);
             if (data == null) {
                 if (System.currentTimeMillis() - shuttleProtocol.getLastOnlineTime() > 1000 * 60) {
                     //鏈�鍚庝竴娆′笂绾挎椂闂磋秴杩�60s锛岃瀹氱绾�
@@ -395,7 +422,7 @@
                 socketResults.remove(removeIdx);
             }
         } catch (Exception e) {
-//            e.printStackTrace();
+            e.printStackTrace();
         }
     }
 
@@ -705,6 +732,23 @@
             return true;
         }
         return false;
+    }
+
+    @Override
+    public boolean isFault() {
+        if (this.shuttleProtocol.getErrorCode() == null
+                || this.shuttleProtocol.getMode() == null
+                || this.shuttleProtocol.getExtend() == null
+        ) {
+            return false;
+        }
+
+        InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();
+        boolean res = this.shuttleProtocol.getMode() == 0
+                && !this.shuttleProtocol.getErrorCode().equals("0")
+                && extend.getSuspendState() == 1
+                ;
+        return res;
     }
 
     @Override
@@ -1075,17 +1119,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娆�
         JSONObject result = null;
         for (int i = 0; i < 10; i++) {
-            result = getRequestBody(requestType);
+            result = getRequestBody(requestType, taskId);
             if (result == null) {
                 try {
                     Thread.sleep(100);
@@ -1099,6 +1146,22 @@
         return result;//杩斿洖Body缁撴灉闆�
     }
 
+    private void requestCommandAsync(NyShuttleHttpCommand httpCommand) throws IOException {
+        if (this.socket == null) {
+            return;
+        }
+
+        //鍘嬬缉鏁版嵁鍖�
+        JSONObject data = JSON.parseObject(JSON.toJSONString(httpCommand));
+        data.remove("nodes");
+
+        // 鑾峰彇杈撳嚭娴�
+        OutputStreamWriter writer = new OutputStreamWriter(this.socket.getOutputStream());
+        writer.write(JSON.toJSONString(data) + "\r\n");
+        writer.flush();
+//            System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
+    }
+
     private JSONObject filterBodyData(JSONObject data) {
         Object response = data.get("response");
         if (response == null) {

--
Gitblit v1.9.1