From f6046d2fc1503dc76fc06c51604b480664f532a3 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 06 一月 2026 09:52:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/ZyStationThread.java |   94 ++++++++++++++++++----------------------------
 1 files changed, 37 insertions(+), 57 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
index 9f7db71..df9af2a 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -28,10 +28,7 @@
 
 import java.text.MessageFormat;
 import java.util.*;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -49,9 +46,6 @@
     private ZyStationConnectDriver zyStationConnectDriver;
     private int deviceLogCollectTime = 200;
     private long deviceDataLogTime = System.currentTimeMillis();
-    private volatile boolean closed = false;
-    private ScheduledExecutorService readExecutor;
-    private ScheduledExecutorService processExecutor;
 
     public ZyStationThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
         this.deviceConfig = deviceConfig;
@@ -64,53 +58,38 @@
         this.connect();
         deviceLogCollectTime = Utils.getDeviceLogCollectTime();
 
-        readExecutor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
-            @Override
-            public Thread newThread(Runnable r) {
-                Thread t = new Thread(r);
-                t.setName("DevpReader-" + deviceConfig.getDeviceNo());
-                t.setDaemon(true);
-                return t;
+        Thread readThread = new Thread(() -> {
+            while (true) {
+                try {
+                    deviceLogCollectTime = Utils.getDeviceLogCollectTime();
+                    readStatus();
+                    Thread.sleep(100);
+                } catch (Exception e) {
+                    log.error("StationThread Fail", e);
+                }
             }
         });
-        readExecutor.scheduleAtFixedRate(() -> {
-            if (closed || Thread.currentThread().isInterrupted()) {
-                return;
-            }
-            try {
-                deviceLogCollectTime = Utils.getDeviceLogCollectTime();
-                readStatus();
-            } catch (Exception e) {
-                log.error("StationThread Fail", e);
-            }
-        }, 0, 200, TimeUnit.MILLISECONDS);
+        readThread.start();
 
-        processExecutor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
-            @Override
-            public Thread newThread(Runnable r) {
-                Thread t = new Thread(r);
-                t.setName("DevpWriter-" + deviceConfig.getDeviceNo());
-                t.setDaemon(true);
-                return t;
+        Thread processThread = new Thread(() -> {
+            while (true) {
+                try {
+                    int step = 1;
+                    Task task = MessageQueue.poll(SlaveType.Devp, deviceConfig.getDeviceNo());
+                    if (task != null) {
+                        step = task.getStep();
+                    }
+                    if (step == 2) {
+                        sendCommand((StationCommand) task.getData());
+                    }
+
+                    Thread.sleep(100);
+                } catch (Exception e) {
+                    log.error("StationProcess Fail", e);
+                }
             }
         });
-        processExecutor.scheduleAtFixedRate(() -> {
-            if (closed || Thread.currentThread().isInterrupted()) {
-                return;
-            }
-            try {
-                int step = 1;
-                Task task = MessageQueue.poll(SlaveType.Devp, deviceConfig.getDeviceNo());
-                if (task != null) {
-                    step = task.getStep();
-                }
-                if (step == 2 && task != null) {
-                    sendCommand((StationCommand) task.getData());
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }, 0, 200, TimeUnit.MILLISECONDS);
+        processThread.start();
     }
 
     private void readStatus() {
@@ -190,15 +169,6 @@
 
     @Override
     public void close() {
-        closed = true;
-        ScheduledExecutorService ex = readExecutor;
-        if (ex != null) {
-            try { ex.shutdownNow(); } catch (Exception ignore) {}
-        }
-        ScheduledExecutorService px = processExecutor;
-        if (px != null) {
-            try { px.shutdownNow(); } catch (Exception ignore) {}
-        }
         if (zyStationConnectDriver != null) {
             zyStationConnectDriver.close();
         }
@@ -266,4 +236,14 @@
         }
         return map;
     }
+
+    @Override
+    public CommandResponse sendOriginCommand(String address, short[] data) {
+        return zyStationConnectDriver.sendOriginCommand(address, data);
+    }
+
+    @Override
+    public byte[] readOriginCommand(String address, int length) {
+        return zyStationConnectDriver.readOriginCommand(address, length);
+    }
 }

--
Gitblit v1.9.1