From cf9211f711be85c8e0c1c739d01c8694d2cf5c51 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 13 四月 2026 16:23:04 +0800
Subject: [PATCH] 屏蔽预调度任务
---
src/main/java/com/zy/core/plugin/NormalProcess.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index 44385b9..34b90a4 100644
--- a/src/main/java/com/zy/core/plugin/NormalProcess.java
+++ b/src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -9,6 +9,7 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.dispatch.StationCommandDispatcher;
import com.zy.core.enums.RedisKeyType;
@@ -16,6 +17,7 @@
import com.zy.core.enums.StationCommandType;
import com.zy.core.enums.WrkIoType;
import com.zy.core.model.StationObjModel;
+import com.zy.core.model.Task;
import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.plugin.api.MainProcessPluginApi;
@@ -30,6 +32,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@Slf4j
@Component
@@ -60,17 +63,26 @@
//鎵ц鍫嗗灈鏈轰换鍔★紝鎸� lane 涓茶鎻愪氦
crnOperateUtils.submitCrnIoTasks(DISPATCH_INTERVAL_MS);
+
//鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴愶紝鎸� lane 涓茶鎻愪氦
crnOperateUtils.submitCrnIoExecuteFinishTasks(DISPATCH_INTERVAL_MS);
+ // 妫�娴嬪叆搴撲换鍔℃槸鍚﹀凡缁忓埌杈剧洰鏍囩珯鍙�
+ stationOperateProcessUtils.submitInboundStationArrivalTasks(DISPATCH_INTERVAL_MS);
//鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔★紝鎸� lane 涓茶鎻愪氦
stationOperateProcessUtils.submitStationInTasks(DISPATCH_INTERVAL_MS);
+
//鎵ц杈撻�佺珯鐐瑰嚭搴撲换鍔★紝鎸� lane 涓茶鎻愪氦
stationOperateProcessUtils.submitCrnStationOutTasks(DISPATCH_INTERVAL_MS);
+ // 妫�娴嬪嚭搴撲换鍔℃槸鍚﹀凡缁忓埌杈剧洰鏍囩珯鍙�
+ stationOperateProcessUtils.submitStationOutExecuteFinishTasks(DISPATCH_INTERVAL_MS);
+ // 妫�娴嬬珯鍙拌繍琛屽畬鎴愬悗鐨勪换鍔¤浆瀹屾垚
+ stationOperateProcessUtils.submitCheckTaskToCompleteTasks(DISPATCH_INTERVAL_MS);
//妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉烇紝鎸� lane 涓茶鎻愪氦
stationOperateProcessUtils.submitCheckStationRunBlockTasks(DISPATCH_INTERVAL_MS);
//妫�娴嬭緭閫佺珯鐐逛换鍔″仠鐣欒秴鏃跺悗閲嶆柊璁＄畻璺緞锛屾寜 lane 涓茶鎻愪氦
stationOperateProcessUtils.submitCheckStationIdleRecoverTasks(DISPATCH_INTERVAL_MS);
+
}
/**
@@ -102,6 +114,23 @@
}
StationProtocol stationProtocol = stationMap.get(stationId);
+ //鎵爜寮傚父锛岄��鍥炲叆搴撶珯鐐�
+ if (stationProtocol.getError() > 0) {
+ Object object = redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getTaskNo());
+ if (!Objects.isNull(object)) {
+ continue;
+ }
+ StationObjModel backStation = stationObjModel.getBackStation();
+ StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.STATION_BACK.id), stationId, backStation.getStationId(), 0);
+ if (Objects.isNull(command)) {
+ News.taskInfo(stationProtocol.getTaskNo(), "{}宸ヤ綔,鑾峰彇杈撻�佺嚎鍛戒护澶辫触", stationProtocol.getTaskNo());
+ continue;
+ }
+ MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ News.taskInfo(stationProtocol.getTaskNo(), "{}鎵爜寮傚父锛屽凡閫�鍥炶嚦{}", backStation.getStationId());
+ redisUtil.set(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getTaskNo(), 10);
+ }
+
if (!canSubmitGenerateStoreTask(basDevp, stationThread, stationObjModel, stationProtocol)) {
continue;
}
--
Gitblit v1.9.1