From 96f987b030f4c961a985f07079ba12abd865fdb2 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 17 十二月 2025 08:12:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZyStationThread.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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..6eb4b94 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;
@@ -42,7 +43,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 Thread mainThread;
+ private Thread readThread;
public ZyStationThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
@@ -53,13 +58,17 @@
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
this.connect();
+ deviceLogCollectTime = Utils.getDeviceLogCollectTime();
+ mainThread = Thread.currentThread();
- //璁惧璇诲彇
- Thread readThread = new Thread(() -> {
- while (true) {
+ readThread = new Thread(() -> {
+ while (!closed && !Thread.currentThread().isInterrupted()) {
try {
readStatus();
Thread.sleep(200);
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ break;
} catch (Exception e) {
log.error("StationThread Fail", e);
}
@@ -67,7 +76,7 @@
});
readThread.start();
- while (true) {
+ while (!closed && !Thread.currentThread().isInterrupted()) {
try {
int step = 1;
Task task = MessageQueue.poll(SlaveType.Devp, deviceConfig.getDeviceNo());
@@ -82,6 +91,9 @@
break;
}
Thread.sleep(200);
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ break;
} catch (Exception e) {
e.printStackTrace();
}
@@ -94,7 +106,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 +151,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 +169,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;
+ Thread t = mainThread;
+ if (t != null) {
+ try { t.interrupt(); } catch (Exception ignore) {}
+ }
+ Thread rt = readThread;
+ if (rt != null) {
+ try { rt.interrupt(); } catch (Exception ignore) {}
+ }
+ if (zyStationConnectDriver != null) {
+ zyStationConnectDriver.close();
+ }
}
@Override
--
Gitblit v1.9.1