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/ZyStationConnectDriver.java | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
index 13e68d7..61edc2a 100644
--- a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
@@ -10,6 +10,10 @@
import com.zy.core.network.fake.ZyStationFakeConnect;
import com.zy.core.network.real.ZyStationRealConnect;
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;
/**
* 杈撻�佺珯杩炴帴椹卞姩
@@ -21,29 +25,15 @@
private DeviceConfig deviceConfig;
private ZyStationConnectApi zyStationConnectApi;
private volatile boolean closed = false;
- private Thread selfThread;
+ private ScheduledExecutorService executor;
public ZyStationConnectDriver(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
@@ -62,9 +52,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 (zyStationConnectApi != null) {
zyStationConnectApi.disconnect();
@@ -74,8 +64,28 @@
}
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("DevpConnect-" + 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 List<ZyStationStatusEntity> getStatus() {
--
Gitblit v1.9.1