From c8de85433e5800a7b5595a96d99f4b49f24c38b4 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 16 十二月 2025 13:11:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZyRgvThread.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java b/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
index 420650f..e5c2d77 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
@@ -40,6 +40,8 @@
private ZyRgvConnectDriver zyRgvConnectDriver;
private RgvProtocol rgvProtocol;
private int deviceLogCollectTime = 200;
+ private volatile boolean closed = false;
+ private Thread mainThread;
public ZyRgvThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
@@ -51,7 +53,8 @@
public void run() {
connect();
initRgv();
- while (!Thread.currentThread().isInterrupted()) {
+ mainThread = Thread.currentThread();
+ while (!closed && !Thread.currentThread().isInterrupted()) {
try {
deviceLogCollectTime = Utils.getDeviceLogCollectTime();
int step = 1;
@@ -70,6 +73,9 @@
break;
}
Thread.sleep(200);
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ break;
} catch (Exception e) {
e.printStackTrace();
}
@@ -92,7 +98,7 @@
@Override
public boolean connect() {
zyRgvConnectDriver = new ZyRgvConnectDriver(deviceConfig);
- new Thread(zyRgvConnectDriver).start();
+ zyRgvConnectDriver.start();
DeviceConnectPool.put(SlaveType.Rgv, deviceConfig.getDeviceNo(), zyRgvConnectDriver);
return true;
}
@@ -151,7 +157,14 @@
@Override
public void close() {
- zyRgvConnectDriver.close();
+ closed = true;
+ Thread t = mainThread;
+ if (t != null) {
+ try { t.interrupt(); } catch (Exception ignore) {}
+ }
+ if (zyRgvConnectDriver != null) {
+ zyRgvConnectDriver.close();
+ }
}
@Override
--
Gitblit v1.9.1