From 343ca8514b30c11748c6b5d087d4dbb7262341e1 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 31 三月 2025 09:17:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 d243434..e3a1b4c 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -361,11 +361,15 @@
shuttleProtocol.setPakMk(true);
}
- if (shuttleProtocol.getProtocolStatusType() == null && shuttleProtocol.getDeviceStatus().intValue() == 0) {
+ if (shuttleProtocol.getProtocolStatusType() == null && shuttleProtocol.getDeviceStatus().intValue() == 1) {
//灏忚溅绌洪棽鐘舵�併�佸皬杞︿换鍔＄姸鎬佷负鏈煡锛岃瀹氭浘绂荤嚎杩囷紝闇�瑕佸浣嶆垚绌洪棽
shuttleProtocol.setProtocolStatusType(ShuttleProtocolStatusType.IDLE);
}
+ if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE) && shuttleProtocol.getDeviceStatus().intValue() == 1) {
+ shuttleProtocol.setProtocolStatusType(ShuttleProtocolStatusType.IDLE);
+ }
+
this.originDeviceData = data;
OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1