From d8896f48cf6d3ab0b38d289522be15ad239552d3 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 15 十二月 2025 14:20:16 +0800
Subject: [PATCH] #AI
---
src/main/java/com/zy/core/network/ZyRgvConnectDriver.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java b/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java
index b9f6f9b..bd015f1 100644
--- a/src/main/java/com/zy/core/network/ZyRgvConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyRgvConnectDriver.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;
@@ -14,19 +13,17 @@
@Slf4j
public class ZyRgvConnectDriver implements ThreadHandler {
private boolean connected = false;
- private SiemensS7Net siemensNet;
private DeviceConfig deviceConfig;
private ZyRgvConnectApi zyRgvConnectApi;
- public ZyRgvConnectDriver(SiemensS7Net siemensS7Net, DeviceConfig deviceConfig) {
- this.siemensNet = siemensS7Net;
+ public ZyRgvConnectDriver(DeviceConfig deviceConfig) {
this.deviceConfig = deviceConfig;
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
if (!connected) {
connect();
@@ -41,7 +38,7 @@
@Override
public boolean connect() {
if (deviceConfig.getFake() == 0) {
- zyRgvConnectApi = new ZyRgvRealConnect(siemensNet, deviceConfig);
+ zyRgvConnectApi = new ZyRgvRealConnect(deviceConfig);
} else {
zyRgvConnectApi = new ZyRgvFakeConnect(deviceConfig);
}
@@ -58,6 +55,9 @@
}
public ZyRgvStatusEntity getStatus() {
+ if (zyRgvConnectApi == null) {
+ return null;
+ }
return zyRgvConnectApi.getStatus();
}
--
Gitblit v1.9.1