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/ZyStationThread.java | 86 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 22 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 ea8e40f..246f081 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.utils.Utils;
import com.zy.core.network.DeviceConnectPool;
import com.zy.core.thread.StationThread;
import com.alibaba.fastjson.JSON;
@@ -27,6 +28,10 @@
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;
@@ -42,7 +47,11 @@
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
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;
@@ -53,39 +62,55 @@
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
this.connect();
+ deviceLogCollectTime = Utils.getDeviceLogCollectTime();
- //璁惧璇诲彇
- Thread readThread = new Thread(() -> {
- while (true) {
- try {
- readStatus();
- Thread.sleep(200);
- } catch (Exception e) {
- log.error("StationThread Fail", e);
- }
+ 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;
}
});
- readThread.start();
+ 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);
- while (true) {
+ 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;
+ }
+ });
+ 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();
}
- switch (step) {
- case 2:
- sendCommand((StationCommand) task.getData());
- break;
- default:
- break;
+ if (step == 2 && task != null) {
+ sendCommand((StationCommand) task.getData());
}
- Thread.sleep(200);
} catch (Exception e) {
e.printStackTrace();
}
- }
+ }, 0, 200, TimeUnit.MILLISECONDS);
}
private void readStatus() {
@@ -94,7 +119,12 @@
}
if(statusList.isEmpty()) {
- BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ BasDevpService basDevpService = null;
+ try {
+ basDevpService = SpringUtils.getBean(BasDevpService.class);
+ } catch (Exception e) {
+
+ }
if (basDevpService == null) {
return;
}
@@ -134,7 +164,7 @@
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), deviceConfig.getDeviceNo()));
- if (System.currentTimeMillis() - deviceDataLogTime > 1000 * 1) {
+ if (System.currentTimeMillis() - deviceDataLogTime > deviceLogCollectTime) {
//淇濆瓨鏁版嵁璁板綍
DeviceDataLog deviceDataLog = new DeviceDataLog();
deviceDataLog.setOriginData(JSON.toJSONString(zyStationStatusEntities));
@@ -152,13 +182,25 @@
@Override
public boolean connect() {
zyStationConnectDriver = new ZyStationConnectDriver(deviceConfig);
- new Thread(zyStationConnectDriver).start();
+ zyStationConnectDriver.start();
DeviceConnectPool.put(SlaveType.Devp, deviceConfig.getDeviceNo(), zyStationConnectDriver);
return true;
}
@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();
+ }
}
@Override
--
Gitblit v1.9.1