From f375928943ad4b9fe6d8508e151971dcdc23e982 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 05 一月 2026 16:18:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 87 ++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 59 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 a29d75a..72610b6 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -30,10 +30,6 @@
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;
/**
* 鍫嗗灈鏈虹嚎绋�
@@ -47,10 +43,6 @@
private ZyCrnConnectDriver zyCrnConnectDriver;
private CrnProtocol crnProtocol;
private int deviceLogCollectTime = 200;
- private boolean resetFlag = false;
- private volatile boolean closed = false;
- private ScheduledExecutorService readExecutor;
- private ScheduledExecutorService processExecutor;
public ZySiemensCrnThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
@@ -62,53 +54,39 @@
public void run() {
this.connect();
this.initCrn();
- readExecutor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
- @Override
- public Thread newThread(Runnable r) {
- Thread t = new Thread(r);
- t.setName("CrnReader-" + 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("CrnThread Fail", e);
- }
- }, 0, 200, TimeUnit.MILLISECONDS);
- processExecutor = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
- @Override
- public Thread newThread(Runnable r) {
- Thread t = new Thread(r);
- t.setName("CrnWriter-" + 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("CrnThread Fail", e);
+ }
}
});
- processExecutor.scheduleAtFixedRate(() -> {
- if (closed || Thread.currentThread().isInterrupted()) {
- return;
- }
- try {
- int step = 1;
- Task task = MessageQueue.poll(SlaveType.Crn, deviceConfig.getDeviceNo());
- if (task != null) {
- step = task.getStep();
+ readThread.start();
+
+ Thread processThread = new Thread(() -> {
+ while (true) {
+ try {
+ int step = 1;
+ Task task = MessageQueue.poll(SlaveType.Crn, deviceConfig.getDeviceNo());
+ if (task != null) {
+ step = task.getStep();
+ }
+ if (step == 2) {
+ sendCommand((CrnCommand) task.getData());
+ }
+
+ Thread.sleep(100);
+ } catch (Exception e) {
+ log.error("CrnProcess Fail", e);
}
- if (step == 2 && task != null) {
- sendCommand((CrnCommand) task.getData());
- }
- } catch (Exception e) {
- e.printStackTrace();
}
- }, 0, 200, TimeUnit.MILLISECONDS);
+ });
+ processThread.start();
}
/**
@@ -240,15 +218,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 (zyCrnConnectDriver != null) {
zyCrnConnectDriver.close();
}
--
Gitblit v1.9.1