From 7b87595a7379c7b250233e2bfcbf8b44ab4a539d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 31 三月 2026 20:19:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/plugin/GslProcess.java | 102 +++++++++++++++------------------------------------
1 files changed, 30 insertions(+), 72 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index fe7e669..eb4391e 100644
--- a/src/main/java/com/zy/core/plugin/GslProcess.java
+++ b/src/main/java/com/zy/core/plugin/GslProcess.java
@@ -22,29 +22,25 @@
import com.zy.core.plugin.store.StoreInTaskContext;
import com.zy.core.plugin.store.StoreInTaskGenerationService;
import com.zy.core.plugin.store.StoreInTaskPolicy;
+import com.zy.core.task.MainProcessAsyncTaskScheduler;
import com.zy.core.thread.StationThread;
import com.zy.core.utils.CrnOperateProcessUtils;
import com.zy.core.utils.StationOperateProcessUtils;
-import jakarta.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
@Slf4j
@Component
public class GslProcess implements MainProcessPluginApi, StoreInTaskPolicy {
- private static final long STATION_DISPATCH_INTERVAL_MS = 200L;
- private static final long STATION_MAINTENANCE_INTERVAL_MS = 500L;
- private static final long STATION_TASK_SLOW_LOG_THRESHOLD_MS = 1000L;
- private static final long STATION_EXECUTOR_SHUTDOWN_TIMEOUT_SECONDS = 5L;
+ private static final String CRN_TASK_LANE = "crn";
+ private static final String STATION_TASK_LANE = "station";
+ private static final long DISPATCH_INTERVAL_MS = 200L;
+ private static final long MAINTENANCE_INTERVAL_MS = 500L;
+ private static final long TASK_SLOW_LOG_THRESHOLD_MS = 1000L;
@Autowired
private CrnOperateProcessUtils crnOperateUtils;
@@ -60,15 +56,8 @@
private StoreInTaskGenerationService storeInTaskGenerationService;
@Autowired
private StationCommandDispatcher stationCommandDispatcher;
-
- private final ExecutorService stationTaskExecutor = Executors.newSingleThreadExecutor(r -> {
- Thread thread = new Thread(r);
- thread.setName("StationTask");
- thread.setDaemon(true);
- return thread;
- });
- private final Map<String, AtomicBoolean> stationTaskRunningMap = new ConcurrentHashMap<>();
- private final Map<String, Long> stationTaskLastSubmitTimeMap = new ConcurrentHashMap<>();
+ @Autowired
+ private MainProcessAsyncTaskScheduler mainProcessAsyncTaskScheduler;
@Override
public void run() {
@@ -77,17 +66,15 @@
//璇锋眰鐢熸垚鍏ュ簱浠诲姟
generateStoreWrkFile();
- //鎵ц鍫嗗灈鏈轰换鍔�
- crnOperateUtils.crnIoExecute();
- //鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�
- crnOperateUtils.crnIoExecuteFinish();
- //杈撻�佺珯鐐归�昏緫鍒囧埌鍚庡彴涓茶鎵ц锛岄伩鍏嶉樆濉炰富娴佺▼閲岀殑鍫嗗灈鏈哄彂浠诲姟
- submitStationTask("stationInExecute", STATION_DISPATCH_INTERVAL_MS, stationOperateProcessUtils::stationInExecute);
- submitStationTask("crnStationOutExecute", STATION_DISPATCH_INTERVAL_MS, stationOperateProcessUtils::crnStationOutExecute);
- submitStationTask("checkStationOutOrder", STATION_MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationOutOrder);
- submitStationTask("watchCircleStation", STATION_MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::watchCircleStation);
- submitStationTask("checkStationRunBlock", STATION_MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationRunBlock);
- submitStationTask("checkStationIdleRecover", STATION_MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationIdleRecover);
+ //鍫嗗灈鏈轰笌杈撻�佺珯鐐归兘鎸夊崟涓换鍔℃彁浜ゅ埌鍚勮嚜涓茶閫氶亾锛岄�愪釜鎵ц
+ submitCrnTask("crnIoExecute", DISPATCH_INTERVAL_MS, crnOperateUtils::crnIoExecute);
+ submitCrnTask("crnIoExecuteFinish", DISPATCH_INTERVAL_MS, crnOperateUtils::crnIoExecuteFinish);
+ submitStationTask("stationInExecute", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::stationInExecute);
+ submitStationTask("crnStationOutExecute", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::crnStationOutExecute);
+ submitStationTask("checkStationOutOrder", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationOutOrder);
+ submitStationTask("watchCircleStation", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::watchCircleStation);
+ submitStationTask("checkStationRunBlock", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationRunBlock);
+ submitStationTask("checkStationIdleRecover", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationIdleRecover);
}
/**
@@ -186,50 +173,21 @@
}
private void submitStationTask(String taskName, long minIntervalMs, Runnable task) {
- long now = System.currentTimeMillis();
- Long lastSubmitTime = stationTaskLastSubmitTimeMap.get(taskName);
- if (lastSubmitTime != null && now - lastSubmitTime < minIntervalMs) {
- return;
- }
-
- AtomicBoolean running = stationTaskRunningMap.computeIfAbsent(taskName, key -> new AtomicBoolean(false));
- if (!running.compareAndSet(false, true)) {
- return;
- }
-
- stationTaskLastSubmitTimeMap.put(taskName, now);
- try {
- stationTaskExecutor.execute(() -> {
- long startMs = System.currentTimeMillis();
- try {
- task.run();
- } catch (Exception e) {
- log.error("GslProcess station task {} execute error", taskName, e);
- } finally {
- long costMs = System.currentTimeMillis() - startMs;
- if (costMs > STATION_TASK_SLOW_LOG_THRESHOLD_MS) {
- log.warn("GslProcess station task {} executed slowly, cost={}ms", taskName, costMs);
- }
- running.set(false);
- }
- });
- } catch (Exception e) {
- running.set(false);
- stationTaskLastSubmitTimeMap.remove(taskName);
- log.error("GslProcess station task {} submit error", taskName, e);
- }
+ submitProcessTask(STATION_TASK_LANE, taskName, minIntervalMs, task);
}
- @PreDestroy
- public void shutDown() {
- stationTaskExecutor.shutdownNow();
- try {
- if (!stationTaskExecutor.awaitTermination(STATION_EXECUTOR_SHUTDOWN_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
- log.warn("GslProcess station task executor did not terminate within {}s", STATION_EXECUTOR_SHUTDOWN_TIMEOUT_SECONDS);
- }
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
+ private void submitCrnTask(String taskName, long minIntervalMs, Runnable task) {
+ submitProcessTask(CRN_TASK_LANE, taskName, minIntervalMs, task);
+ }
+
+ private void submitProcessTask(String laneName, String taskName, long minIntervalMs, Runnable task) {
+ mainProcessAsyncTaskScheduler.submit(
+ laneName,
+ taskName,
+ minIntervalMs,
+ TASK_SLOW_LOG_THRESHOLD_MS,
+ task
+ );
}
}
--
Gitblit v1.9.1