From 0c5a58771fcf86ad0b562829fbfa440da9392703 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 17 十二月 2025 09:08:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/ZyCrnConnectDriver.java | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java b/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
index 22a1778..48a8a51 100644
--- a/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
@@ -9,6 +9,10 @@
import com.zy.core.network.fake.ZyCrnFakeConnect;
import com.zy.core.network.real.ZyCrnRealConnect;
import lombok.extern.slf4j.Slf4j;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
/**
* 杩炴帴椹卞姩
@@ -20,29 +24,15 @@
private DeviceConfig deviceConfig;
private ZyCrnConnectApi zyCrnConnectApi;
private volatile boolean closed = false;
- private Thread selfThread;
+ private ScheduledExecutorService executor;
public ZyCrnConnectDriver(DeviceConfig deviceConfig) {
this.deviceConfig = deviceConfig;
}
@Override
- @SuppressWarnings("InfiniteLoopStatement")
public void run() {
- selfThread = Thread.currentThread();
- while (!closed && !Thread.currentThread().isInterrupted()) {
- try {
- if (!connected) {
- connect();
- }
- Thread.sleep(1000);
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
- break;
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+
}
@Override
@@ -61,9 +51,9 @@
@Override
public void close() {
closed = true;
- Thread t = selfThread;
- if (t != null) {
- try { t.interrupt(); } catch (Exception ignore) {}
+ ScheduledExecutorService ex = executor;
+ if (ex != null) {
+ try { ex.shutdownNow(); } catch (Exception ignore) {}
}
if (zyCrnConnectApi != null) {
zyCrnConnectApi.disconnect();
@@ -73,8 +63,27 @@
}
public void start() {
- Thread t = new Thread(this);
- t.start();
+ executor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+ @Override
+ public Thread newThread(Runnable r) {
+ Thread t = new Thread(r);
+ t.setName("CrnConnect-" + deviceConfig.getDeviceNo());
+ t.setDaemon(true);
+ return t;
+ }
+ });
+ executor.scheduleAtFixedRate(() -> {
+ if (closed || Thread.currentThread().isInterrupted()) {
+ return;
+ }
+ try {
+ if (!connected) {
+ connect();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }, 0, 1000, TimeUnit.MILLISECONDS);
}
public ZyCrnStatusEntity getStatus() {
--
Gitblit v1.9.1