From c8de85433e5800a7b5595a96d99f4b49f24c38b4 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 16 十二月 2025 13:11:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index 4cc6ef1..d8decf5 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -45,6 +45,8 @@
private CrnProtocol crnProtocol;
private int deviceLogCollectTime = 200;
private boolean resetFlag = false;
+ private volatile boolean closed = false;
+ private Thread mainThread;
public ZySiemensCrnThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
@@ -56,7 +58,8 @@
public void run() {
this.connect();
this.initCrn();
- while (true) {
+ mainThread = Thread.currentThread();
+ while (!closed && !Thread.currentThread().isInterrupted()) {
try {
deviceLogCollectTime = Utils.getDeviceLogCollectTime();
int step = 1;
@@ -65,7 +68,6 @@
step = task.getStep();
}
switch (step) {
- // 璇绘暟鎹�
case 1:
readStatus();
break;
@@ -76,6 +78,9 @@
break;
}
Thread.sleep(200);
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ break;
} catch (Exception e) {
e.printStackTrace();
}
@@ -112,7 +117,7 @@
@Override
public boolean connect() {
zyCrnConnectDriver = new ZyCrnConnectDriver(deviceConfig);
- new Thread(zyCrnConnectDriver).start();
+ zyCrnConnectDriver.start();
DeviceConnectPool.put(SlaveType.Crn, deviceConfig.getDeviceNo(), zyCrnConnectDriver);
return true;
}
@@ -124,7 +129,6 @@
ZyCrnStatusEntity crnStatus = zyCrnConnectDriver.getStatus();
if (crnStatus == null) {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
- News.error("SiemensCrn璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
return;
}
@@ -212,7 +216,14 @@
@Override
public void close() {
- zyCrnConnectDriver.close();
+ closed = true;
+ Thread t = mainThread;
+ if (t != null) {
+ try { t.interrupt(); } catch (Exception ignore) {}
+ }
+ if (zyCrnConnectDriver != null) {
+ zyCrnConnectDriver.close();
+ }
}
@Override
--
Gitblit v1.9.1