From e04f0981da6554606359e6de4e91b752a64aae6c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 29 三月 2025 15:59:20 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 11 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 04bad1b..c025b26 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<>();
 
     //鍘熷璁惧鏁版嵁
@@ -77,6 +78,7 @@
             while (true) {
                 try {
                     listenSocketMessage();
+                    listenInit();//鐩戝惉鍒濆鍖栦簨浠�
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -89,7 +91,7 @@
             while (true) {
                 try {
                     read();
-                    Thread.sleep(200);
+                    Thread.sleep(50);
                 } catch (Exception e) {
                     log.error("ShuttleThread Fail", e);
                 }
@@ -135,7 +137,6 @@
         Thread otherThread = new Thread(() -> {
             while (true) {
                 try {
-                    listenInit();//鐩戝惉鍒濆鍖栦簨浠�
                     saveLog();//淇濆瓨鏁版嵁
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -194,7 +195,19 @@
             }
 
             JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
-            if (!socketResults.isEmpty() && socketResults.size() >= 100) {
+
+            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);//娣诲姞鏁版嵁
@@ -276,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锛岃瀹氱绾�
@@ -723,12 +743,21 @@
             return false;
         }
 
+        if (this.shuttleProtocol.getMode() == 0) {
+            return true;
+        }
+
+        if (!this.shuttleProtocol.getErrorCode().equals("0")) {
+            return true;
+        }
+
         InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();
-        boolean res = this.shuttleProtocol.getMode() == 0
-                && !this.shuttleProtocol.getErrorCode().equals("0")
-                && extend.getSuspendState() == 1
-                ;
-        return res;
+
+        if (extend.getSuspendState() == 1) {
+            return true;
+        }
+
+        return false;
     }
 
     @Override
@@ -1109,9 +1138,9 @@
         }
 
         // 鑾峰彇鏈嶅姟鍣ㄥ搷搴�
-        // 灏濊瘯100娆�
+        // 灏濊瘯10娆�
         JSONObject result = null;
-        for (int i = 0; i < 100; i++) {
+        for (int i = 0; i < 10; i++) {
             result = getRequestBody(requestType, taskId);
             if (result == null) {
                 try {
@@ -1126,6 +1155,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