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/network/ZyStationConnectDriver.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
index 1d722d6..13e68d7 100644
--- a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
@@ -1,6 +1,5 @@
package com.zy.core.network;
-import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.core.ThreadHandler;
import com.zy.core.model.CommandResponse;
@@ -21,6 +20,8 @@
private boolean connected = false;
private DeviceConfig deviceConfig;
private ZyStationConnectApi zyStationConnectApi;
+ private volatile boolean closed = false;
+ private Thread selfThread;
public ZyStationConnectDriver(DeviceConfig deviceConfig) {
this.deviceConfig = deviceConfig;
@@ -29,12 +30,16 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- while (!Thread.currentThread().isInterrupted()) {
+ 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();
}
@@ -56,9 +61,21 @@
@Override
public void close() {
- zyStationConnectApi.disconnect();
- zyStationConnectApi = null;
+ closed = true;
+ Thread t = selfThread;
+ if (t != null) {
+ try { t.interrupt(); } catch (Exception ignore) {}
+ }
+ if (zyStationConnectApi != null) {
+ zyStationConnectApi.disconnect();
+ zyStationConnectApi = null;
+ }
connected = false;
+ }
+
+ public void start() {
+ Thread t = new Thread(this);
+ t.start();
}
public List<ZyStationStatusEntity> getStatus() {
@@ -71,4 +88,4 @@
public CommandResponse sendCommand(StationCommand command) {
return zyStationConnectApi.sendCommand(command);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1