From 96f987b030f4c961a985f07079ba12abd865fdb2 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 17 十二月 2025 08:12:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/ZyStationConnectDriver.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
index e4d1cec..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;
@@ -19,24 +18,28 @@
public class ZyStationConnectDriver implements ThreadHandler {
private boolean connected = false;
- private SiemensS7Net siemensNet;
private DeviceConfig deviceConfig;
private ZyStationConnectApi zyStationConnectApi;
+ private volatile boolean closed = false;
+ private Thread selfThread;
- public ZyStationConnectDriver(SiemensS7Net siemensS7Net, DeviceConfig deviceConfig) {
- this.siemensNet = siemensS7Net;
+ public ZyStationConnectDriver(DeviceConfig deviceConfig) {
this.deviceConfig = deviceConfig;
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- while (true) {
+ 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();
}
@@ -46,7 +49,7 @@
@Override
public boolean connect() {
if (deviceConfig.getFake() == 0) {
- zyStationConnectApi = new ZyStationRealConnect(siemensNet, deviceConfig);
+ zyStationConnectApi = new ZyStationRealConnect(deviceConfig);
} else {
zyStationConnectApi = new ZyStationFakeConnect(deviceConfig);
}
@@ -58,16 +61,31 @@
@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() {
+ if (zyStationConnectApi == null) {
+ return null;
+ }
return zyStationConnectApi.getStatus();
}
public CommandResponse sendCommand(StationCommand command) {
return zyStationConnectApi.sendCommand(command);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1