From 7fdc76dde7cd00510347e3231c4f60a88b012107 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 19:03:24 +0800
Subject: [PATCH] #预调度堆垛机2
---
src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java | 53 +-------------------------
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 48 ++++++++++++++++--------
2 files changed, 35 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
index fcb9863..0018484 100644
--- a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
+++ b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
@@ -20,17 +20,12 @@
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.thread.StationThread;
import com.zy.core.utils.CrnOperateProcessUtils;
-import com.zy.common.utils.RedisUtil;
-import com.zy.core.enums.RedisKeyType;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.Comparator;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.stream.Collectors;
@Component
public class InboundCrnMoveDispatchScheduler {
@@ -40,20 +35,17 @@
private final CommonService commonService;
private final BasCrnpService basCrnpService;
private final CrnOperateProcessUtils crnOperateProcessUtils;
- private final RedisUtil redisUtil;
public InboundCrnMoveDispatchScheduler(WrkMastService wrkMastService,
BasStationService basStationService,
CommonService commonService,
BasCrnpService basCrnpService,
- CrnOperateProcessUtils crnOperateProcessUtils,
- RedisUtil redisUtil) {
+ CrnOperateProcessUtils crnOperateProcessUtils) {
this.wrkMastService = wrkMastService;
this.basStationService = basStationService;
this.commonService = commonService;
this.basCrnpService = basCrnpService;
this.crnOperateProcessUtils = crnOperateProcessUtils;
- this.redisUtil = redisUtil;
}
@Scheduled(fixedDelay = 1000L)
@@ -165,9 +157,9 @@
}
return pendingOutboundTasks.stream()
- .filter(this::isBatchTaskWithSeq)
- .filter(task -> isWithinCurrentBatchExecuteWindow(task, pendingOutboundTasks))
.filter(this::isCrnMoveBlockingOutboundTask)
+ .filter(this::isBatchTaskWithSeq)
+ .filter(crnOperateProcessUtils::canOutboundTaskExecuteInCurrentBatchWindow)
.findAny()
.isPresent();
}
@@ -186,44 +178,5 @@
return Objects.equals(wrkMast.getWrkSts(), WrkStsType.NEW_OUTBOUND.sts)
|| Objects.equals(wrkMast.getWrkSts(), WrkStsType.OUTBOUND_RUN.sts)
|| Objects.equals(wrkMast.getWrkSts(), WrkStsType.OUTBOUND_MANUAL.sts);
- }
-
- private boolean isWithinCurrentBatchExecuteWindow(WrkMast wrkMast, List<WrkMast> pendingOutboundTasks) {
- if (!isBatchTaskWithSeq(wrkMast) || pendingOutboundTasks == null || pendingOutboundTasks.isEmpty()) {
- return false;
- }
- int batchRunningLimit = getSystemConfigInt("crnOutBatchRunningLimit", 5);
- if (batchRunningLimit <= 0) {
- return true;
- }
- List<WrkMast> sameBatchTasks = pendingOutboundTasks.stream()
- .filter(this::isBatchTaskWithSeq)
- .filter(task -> Objects.equals(task.getBatch(), wrkMast.getBatch()))
- .sorted(Comparator.comparing(WrkMast::getBatchSeq).thenComparing(WrkMast::getWrkNo))
- .collect(Collectors.toList());
- if (sameBatchTasks.isEmpty()) {
- return false;
- }
- int windowSize = Math.min(batchRunningLimit, sameBatchTasks.size());
- for (int i = 0; i < windowSize; i++) {
- WrkMast current = sameBatchTasks.get(i);
- if (current != null && Objects.equals(current.getWrkNo(), wrkMast.getWrkNo())) {
- return true;
- }
- }
- return false;
- }
-
- private int getSystemConfigInt(String code, int defaultValue) {
- Object systemConfigMapObj = redisUtil == null ? null : redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
- if (!(systemConfigMapObj instanceof HashMap)) {
- return defaultValue;
- }
- try {
- HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
- return Integer.parseInt(systemConfigMap.getOrDefault(code, String.valueOf(defaultValue)));
- } catch (Exception ignore) {
- return defaultValue;
- }
}
}
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 67cfb8a..32caee7 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -385,7 +385,7 @@
return false;
}
- if (!allowBatchOutboundExecute(wrkMast)) {
+ if (!allowBatchOutboundExecute(wrkMast, true)) {
return false;
}
@@ -458,13 +458,19 @@
return false;
}
- private boolean allowBatchOutboundExecute(WrkMast wrkMast) {
+ public boolean canOutboundTaskExecuteInCurrentBatchWindow(WrkMast wrkMast) {
+ return allowBatchOutboundExecute(wrkMast, false);
+ }
+
+ private boolean allowBatchOutboundExecute(WrkMast wrkMast, boolean logBlockedReason) {
if (wrkMast == null || Cools.isEmpty(wrkMast.getBatch())) {
return true;
}
if (Cools.isEmpty(wrkMast.getBatchSeq())) {
- News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 缂哄皯鎵规搴忓彿锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱", wrkMast.getBatch());
+ if (logBlockedReason) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 缂哄皯鎵规搴忓彿锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱", wrkMast.getBatch());
+ }
return false;
}
@@ -479,7 +485,9 @@
}
if (Cools.isEmpty(firstBatchWrkMast.getBatchSeq())) {
- News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 瀛樺湪鏈厤缃壒娆″簭鍙风殑浠诲姟锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱", wrkMast.getBatch());
+ if (logBlockedReason) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 瀛樺湪鏈厤缃壒娆″簭鍙风殑浠诲姟锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱", wrkMast.getBatch());
+ }
return false;
}
@@ -487,7 +495,9 @@
boolean firstBatchTaskExecuted = firstBatchWrkMast.getWrkSts() != null
&& !firstBatchWrkMast.getWrkSts().equals(WrkStsType.NEW_OUTBOUND.sts);
if (!currentIsFirstBatchTask && !firstBatchTaskExecuted) {
- News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 棣栦釜搴忓彿浠诲姟:{} 灏氭湭鎵ц锛屽綋鍓嶄换鍔℃殏涓嶅厑璁稿嚭搴�", wrkMast.getBatch(), firstBatchWrkMast.getWrkNo());
+ if (logBlockedReason) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 棣栦釜搴忓彿浠诲姟:{} 灏氭湭鎵ц锛屽綋鍓嶄换鍔℃殏涓嶅厑璁稿嚭搴�", wrkMast.getBatch(), firstBatchWrkMast.getWrkNo());
+ }
return false;
}
@@ -498,20 +508,24 @@
List<WrkMast> unfinishedBatchWrkMasts = listUnfinishedBatchWrkMasts(wrkMast.getBatch());
if (hasMissingBatchSeq(unfinishedBatchWrkMasts)) {
- News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 瀛樺湪鏈厤缃壒娆″簭鍙风殑鏈畬鎴愪换鍔★紝鏆備笉鍏佽鍫嗗灈鏈哄嚭搴�", wrkMast.getBatch());
+ if (logBlockedReason) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 瀛樺湪鏈厤缃壒娆″簭鍙风殑鏈畬鎴愪换鍔★紝鏆備笉鍏佽鍫嗗灈鏈哄嚭搴�", wrkMast.getBatch());
+ }
return false;
}
if (!isWithinBatchExecuteWindow(wrkMast, unfinishedBatchWrkMasts, batchRunningLimit)) {
- List<Integer> windowBatchSeqList = unfinishedBatchWrkMasts.stream()
- .limit(Math.min(batchRunningLimit, unfinishedBatchWrkMasts.size()))
- .map(WrkMast::getBatchSeq)
- .collect(java.util.stream.Collectors.toList());
- News.taskInfo(wrkMast.getWrkNo(),
- "鎵规:{} 褰撳墠涓ユ牸鎵ц绐楀彛搴忓彿鍒楄〃涓簕}锛屽綋鍓嶅簭鍙�={}锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱",
- wrkMast.getBatch(),
- windowBatchSeqList,
- wrkMast.getBatchSeq());
+ if (logBlockedReason) {
+ List<Integer> windowBatchSeqList = unfinishedBatchWrkMasts.stream()
+ .limit(Math.min(batchRunningLimit, unfinishedBatchWrkMasts.size()))
+ .map(WrkMast::getBatchSeq)
+ .collect(java.util.stream.Collectors.toList());
+ News.taskInfo(wrkMast.getWrkNo(),
+ "鎵规:{} 褰撳墠涓ユ牸鎵ц绐楀彛搴忓彿鍒楄〃涓簕}锛屽綋鍓嶅簭鍙�={}锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱",
+ wrkMast.getBatch(),
+ windowBatchSeqList,
+ wrkMast.getBatchSeq());
+ }
return false;
}
@@ -523,7 +537,9 @@
WrkStsType.COMPLETE_OUTBOUND.sts,
WrkStsType.SETTLE_OUTBOUND.sts));
if (batchRunningCount >= batchRunningLimit) {
- News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 鎵ц涓换鍔℃暟杈惧埌涓婇檺锛屽綋鍓�={}锛屼笂闄�={}", wrkMast.getBatch(), batchRunningCount, batchRunningLimit);
+ if (logBlockedReason) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 鎵ц涓换鍔℃暟杈惧埌涓婇檺锛屽綋鍓�={}锛屼笂闄�={}", wrkMast.getBatch(), batchRunningCount, batchRunningLimit);
+ }
return false;
}
--
Gitblit v1.9.1