From 9d24c64b9d81ae166f4c150f038793304d7161fa Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 19 十二月 2025 11:13:46 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/network/ZyStationConnectDriver.java |   73 ++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 20 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..25877fb 100644
--- a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
@@ -1,7 +1,7 @@
 package com.zy.core.network;
 
-import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.zy.asrs.entity.DeviceConfig;
+import com.zy.common.utils.RedisUtil;
 import com.zy.core.ThreadHandler;
 import com.zy.core.model.CommandResponse;
 import com.zy.core.model.command.StationCommand;
@@ -11,6 +11,10 @@
 import com.zy.core.network.fake.ZyStationFakeConnect;
 import com.zy.core.network.real.ZyStationRealConnect;
 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;
 
 /**
  * 杈撻�佺珯杩炴帴椹卞姩
@@ -18,35 +22,32 @@
 @Slf4j
 public class ZyStationConnectDriver implements ThreadHandler {
 
+    private static final ZyStationFakeConnect zyStationFakeConnect = new ZyStationFakeConnect();
+
     private boolean connected = false;
     private DeviceConfig deviceConfig;
+    private RedisUtil redisUtil;
     private ZyStationConnectApi zyStationConnectApi;
+    private volatile boolean closed = false;
+    private ScheduledExecutorService executor;
 
-    public ZyStationConnectDriver(DeviceConfig deviceConfig) {
+    public ZyStationConnectDriver(DeviceConfig deviceConfig, RedisUtil redisUtil) {
         this.deviceConfig = deviceConfig;
+        this.redisUtil = redisUtil;
     }
 
     @Override
-    @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
-        while (!Thread.currentThread().isInterrupted()) {
-            try {
-                if (!connected) {
-                    connect();
-                }
-                Thread.sleep(1000);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+        
     }
 
     @Override
     public boolean connect() {
         if (deviceConfig.getFake() == 0) {
-            zyStationConnectApi = new ZyStationRealConnect(deviceConfig);
+            zyStationConnectApi = new ZyStationRealConnect(deviceConfig, redisUtil);
         } else {
-            zyStationConnectApi = new ZyStationFakeConnect(deviceConfig);
+            zyStationFakeConnect.addFakeConnect(deviceConfig, redisUtil);
+            zyStationConnectApi = zyStationFakeConnect;
         }
 
         boolean connect = zyStationConnectApi.connect();
@@ -56,19 +57,51 @@
 
     @Override
     public void close() {
-        zyStationConnectApi.disconnect();
-        zyStationConnectApi = null;
+        closed = true;
+        ScheduledExecutorService ex = executor;
+        if (ex != null) {
+            try { ex.shutdownNow(); } catch (Exception ignore) {}
+        }
+        if (zyStationConnectApi != null) {
+            zyStationConnectApi.disconnect();
+            zyStationConnectApi = null;
+        }
         connected = false;
+    }
+
+    public void start() {
+        executor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread t = new Thread(r);
+                t.setName("DevpConnect-" + 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 List<ZyStationStatusEntity> getStatus() {
         if (zyStationConnectApi == null) {
             return null;
         }
-        return zyStationConnectApi.getStatus();
+        return zyStationConnectApi.getStatus(deviceConfig.getDeviceNo());
     }
 
     public CommandResponse sendCommand(StationCommand command) {
-        return zyStationConnectApi.sendCommand(command);
+        return zyStationConnectApi.sendCommand(deviceConfig.getDeviceNo(), command);
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1