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/thread/impl/ZyRgvThread.java |   82 +++++++++++++++++++++++++++++++++--------
 1 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java b/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
index 656b4dd..295a818 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyRgvThread.java
@@ -10,6 +10,7 @@
 import com.zy.asrs.entity.DeviceDataLog;
 import com.zy.asrs.service.BasRgvService;
 import com.zy.asrs.service.BasRgvOptService;
+import com.zy.asrs.utils.Utils;
 import com.zy.common.utils.RedisUtil;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
@@ -29,6 +30,10 @@
 
 import java.text.MessageFormat;
 import java.util.Date;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 
 @Data
 @Slf4j
@@ -38,6 +43,10 @@
     private RedisUtil redisUtil;
     private ZyRgvConnectDriver zyRgvConnectDriver;
     private RgvProtocol rgvProtocol;
+    private int deviceLogCollectTime = 200;
+    private volatile boolean closed = false;
+    private ScheduledExecutorService readExecutor;
+    private ScheduledExecutorService processExecutor;
 
     public ZyRgvThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
         this.deviceConfig = deviceConfig;
@@ -49,28 +58,53 @@
     public void run() {
         connect();
         initRgv();
-        while (true) {
+        readExecutor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread t = new Thread(r);
+                t.setName("RgvReader-" + deviceConfig.getDeviceNo());
+                t.setDaemon(true);
+                return t;
+            }
+        });
+        readExecutor.scheduleAtFixedRate(() -> {
+            if (closed || Thread.currentThread().isInterrupted()) {
+                return;
+            }
+            try {
+                deviceLogCollectTime = Utils.getDeviceLogCollectTime();
+                readStatus();
+            } catch (Exception e) {
+                log.error("RgvThread Fail", e);
+            }
+        }, 0, 200, TimeUnit.MILLISECONDS);
+
+        processExecutor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread t = new Thread(r);
+                t.setName("RgvWriter-" + deviceConfig.getDeviceNo());
+                t.setDaemon(true);
+                return t;
+            }
+        });
+        processExecutor.scheduleAtFixedRate(() -> {
+            if (closed || Thread.currentThread().isInterrupted()) {
+                return;
+            }
             try {
                 int step = 1;
                 Task task = MessageQueue.poll(SlaveType.Rgv, deviceConfig.getDeviceNo());
                 if (task != null) {
                     step = task.getStep();
                 }
-                switch (step) {
-                    case 1:
-                        readStatus();
-                        break;
-                    case 2:
-                        sendCommand((RgvCommand) task.getData());
-                        break;
-                    default:
-                        break;
+                if (step == 2 && task != null) {
+                    sendCommand((RgvCommand) task.getData());
                 }
-                Thread.sleep(200);
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        }
+        }, 0, 200, TimeUnit.MILLISECONDS);
     }
 
     private void initRgv() {
@@ -89,7 +123,7 @@
     @Override
     public boolean connect() {
         zyRgvConnectDriver = new ZyRgvConnectDriver(deviceConfig);
-        new Thread(zyRgvConnectDriver).start();
+        zyRgvConnectDriver.start();
         DeviceConnectPool.put(SlaveType.Rgv, deviceConfig.getDeviceNo(), zyRgvConnectDriver);
         return true;
     }
@@ -117,7 +151,7 @@
             rgvProtocol.setLastCommandTime(System.currentTimeMillis());
         }
 
-        if (System.currentTimeMillis() - rgvProtocol.getDeviceDataLog() > 200) {
+        if (System.currentTimeMillis() - rgvProtocol.getDeviceDataLog() > deviceLogCollectTime) {
             DeviceDataLog deviceDataLog = new DeviceDataLog();
             deviceDataLog.setOriginData(JSON.toJSONString(s));
             deviceDataLog.setWcsData(JSON.toJSONString(rgvProtocol));
@@ -128,7 +162,12 @@
             rgvProtocol.setDeviceDataLog(System.currentTimeMillis());
         }
 
-        BasRgvService basRgvService = SpringUtils.getBean(BasRgvService.class);
+        BasRgvService basRgvService = null;
+        try {
+            basRgvService = SpringUtils.getBean(BasRgvService.class);
+        } catch (Exception e) {
+
+        }
         if (basRgvService != null) {
             BasRgv basRgv = basRgvService.selectOne(new EntityWrapper<BasRgv>().eq("rgv_no", deviceConfig.getDeviceNo()));
             if(basRgv == null) {
@@ -143,7 +182,18 @@
 
     @Override
     public void close() {
-        zyRgvConnectDriver.close();
+        closed = true;
+        if (zyRgvConnectDriver != null) {
+            zyRgvConnectDriver.close();
+        }
+        ScheduledExecutorService ex = readExecutor;
+        if (ex != null) {
+            try { ex.shutdownNow(); } catch (Exception ignore) {}
+        }
+        ScheduledExecutorService px = processExecutor;
+        if (px != null) {
+            try { px.shutdownNow(); } catch (Exception ignore) {}
+        }
     }
 
     @Override

--
Gitblit v1.9.1