From 34b3f498a7c3663431073a91df35d9936decc5e0 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 15 十二月 2025 08:46:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/ZyCrnConnectDriver.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java b/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
index 1127b47..6691d0b 100644
--- a/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyCrnConnectDriver.java
@@ -18,19 +18,17 @@
public class ZyCrnConnectDriver implements ThreadHandler{
private boolean connected = false;
- private SiemensS7Net siemensNet;
private DeviceConfig deviceConfig;
private ZyCrnConnectApi zyCrnConnectApi;
- public ZyCrnConnectDriver(SiemensS7Net siemensS7Net, DeviceConfig deviceConfig) {
- this.siemensNet = siemensS7Net;
+ public ZyCrnConnectDriver(DeviceConfig deviceConfig) {
this.deviceConfig = deviceConfig;
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
if (!connected) {
connect();
@@ -46,7 +44,7 @@
@Override
public boolean connect() {
if (deviceConfig.getFake() == 0) {
- zyCrnConnectApi = new ZyCrnRealConnect(siemensNet, deviceConfig);
+ zyCrnConnectApi = new ZyCrnRealConnect(deviceConfig);
}else {
zyCrnConnectApi = new ZyCrnFakeConnect(deviceConfig);
}
@@ -64,6 +62,9 @@
}
public ZyCrnStatusEntity getStatus() {
+ if (zyCrnConnectApi == null) {
+ return null;
+ }
return zyCrnConnectApi.getStatus();
}
--
Gitblit v1.9.1