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/ZyRgvConnectDriver.java | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 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..2e64f4a 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;
@@ -10,38 +9,32 @@
import com.zy.core.network.fake.ZyRgvFakeConnect;
import com.zy.core.network.real.ZyRgvRealConnect;
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;
@Slf4j
public class ZyRgvConnectDriver implements ThreadHandler {
private boolean connected = false;
- private SiemensS7Net siemensNet;
private DeviceConfig deviceConfig;
private ZyRgvConnectApi zyRgvConnectApi;
+ private volatile boolean closed = false;
+ private ScheduledExecutorService executor;
- public ZyRgvConnectDriver(SiemensS7Net siemensS7Net, DeviceConfig deviceConfig) {
- this.siemensNet = siemensS7Net;
+ public ZyRgvConnectDriver(DeviceConfig deviceConfig) {
this.deviceConfig = deviceConfig;
}
@Override
- @SuppressWarnings("InfiniteLoopStatement")
public void run() {
- while (true) {
- try {
- if (!connected) {
- connect();
- }
- Thread.sleep(1000);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+
}
@Override
public boolean connect() {
if (deviceConfig.getFake() == 0) {
- zyRgvConnectApi = new ZyRgvRealConnect(siemensNet, deviceConfig);
+ zyRgvConnectApi = new ZyRgvRealConnect(deviceConfig);
} else {
zyRgvConnectApi = new ZyRgvFakeConnect(deviceConfig);
}
@@ -52,16 +45,50 @@
@Override
public void close() {
- zyRgvConnectApi.disconnect();
- zyRgvConnectApi = null;
+ closed = true;
+ ScheduledExecutorService ex = executor;
+ if (ex != null) {
+ try { ex.shutdownNow(); } catch (Exception ignore) {}
+ }
+ if (zyRgvConnectApi != null) {
+ zyRgvConnectApi.disconnect();
+ zyRgvConnectApi = null;
+ }
connected = false;
}
+ public void start() {
+ executor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+ @Override
+ public Thread newThread(Runnable r) {
+ Thread t = new Thread(r);
+ t.setName("RgvConnect-" + 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 ZyRgvStatusEntity getStatus() {
+ if (zyRgvConnectApi == null) {
+ return null;
+ }
return zyRgvConnectApi.getStatus();
}
public CommandResponse sendCommand(RgvCommand command) {
return zyRgvConnectApi.sendCommand(command);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1