From 456273f11d75782e676d43763f0f0601ea5c37f8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 03 七月 2025 16:40:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 e63336a..155696b 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -41,7 +41,6 @@
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.text.MessageFormat;
import java.util.*;
@@ -77,7 +76,7 @@
listenMessageFromRedis();
listenInit();//鐩戝惉鍒濆鍖栦簨浠�
read();
- Thread.sleep(50);
+ Thread.sleep(100);
} catch (Exception e) {
log.error("ShuttleThread Fail", e);
}
@@ -257,6 +256,15 @@
InnerSuhttleExtend extend = new InnerSuhttleExtend();
shuttleProtocol.setExtend(extend);
+ }
+
+ //----------璇诲彇鍥涘悜绌挎杞︾姸鎬�-----------
+ DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
+ NyShuttleHttpCommand readStatusCommand = getReadStatusCommand(slave.getId());
+ //鎸囦护瓒呰繃浜旀潯锛屼笉鍐嶄笅鍙戜换鍔＄姸鎬佽姹�
+ TreeSet<String> deviceCommandMsgListKey = deviceMsgUtils.getDeviceCommandMsgListKey(SlaveType.Shuttle, slave.getId());
+ if (deviceCommandMsgListKey.size() < 5) {
+ requestCommand(readStatusCommand);//璇锋眰鐘舵��
}
if (this.socketReadResults.isEmpty()) {
@@ -1090,7 +1098,7 @@
JSONObject data = JSON.parseObject(JSON.toJSONString(httpCommand));
data.remove("nodes");
- String key = deviceMsgUtils.sendCommand(SlaveType.Shuttle, slave.getId(), data);
+ String key = deviceMsgUtils.sendDeviceCommand(SlaveType.Shuttle, slave.getId(), data);
String requestType = null;
String taskId = null;
--
Gitblit v1.9.1