From bf4e43c1fd1a361029e7cb51daac378fa5ee3617 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 20 三月 2026 18:44:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 241 +++++++++++++++++++++++++++++++++--------------
1 files changed, 169 insertions(+), 72 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 3e388d7..05e0599 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.NotifyMsgType;
+import com.zy.asrs.domain.path.StationPathResolvedPolicy;
import com.zy.asrs.domain.vo.StationCycleCapacityVo;
import com.zy.asrs.domain.vo.StationCycleLoopVo;
import com.zy.asrs.entity.*;
@@ -35,6 +36,7 @@
@Component
public class StationOperateProcessUtils {
private static final int LOOP_LOAD_RESERVE_EXPIRE_SECONDS = 120;
+ private static final int OUT_ORDER_DISPATCH_LIMIT_SECONDS = 10;
@Autowired
private BasDevpService basDevpService;
@@ -56,13 +58,15 @@
private BasStationService basStationService;
@Autowired
private StationCycleCapacityService stationCycleCapacityService;
+ @Autowired
+ private StationPathPolicyService stationPathPolicyService;
//鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
public synchronized void stationInExecute() {
try {
- DispatchLimitConfig limitConfig = getDispatchLimitConfig();
+ DispatchLimitConfig baseLimitConfig = getDispatchLimitConfig(null, null);
int[] currentStationTaskCountRef = new int[]{countCurrentStationTask()};
- LoadGuardState loadGuardState = buildLoadGuardState(limitConfig);
+ LoadGuardState loadGuardState = buildLoadGuardState(baseLimitConfig);
List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
@@ -118,6 +122,7 @@
continue;
}
+ DispatchLimitConfig limitConfig = getDispatchLimitConfig(stationProtocol.getStationId(), targetStationId);
LoopHitResult loopHitResult = findPathLoopHit(limitConfig, stationProtocol.getStationId(), targetStationId, loadGuardState);
if (isDispatchBlocked(limitConfig, currentStationTaskCountRef[0], loadGuardState, loopHitResult.isThroughLoop())) {
@@ -153,9 +158,9 @@
//鎵ц鍫嗗灈鏈鸿緭閫佺珯鐐瑰嚭搴撲换鍔�
public synchronized void crnStationOutExecute() {
try {
- DispatchLimitConfig limitConfig = getDispatchLimitConfig();
+ DispatchLimitConfig baseLimitConfig = getDispatchLimitConfig(null, null);
int[] currentStationTaskCountRef = new int[]{countCurrentStationTask()};
- LoadGuardState loadGuardState = buildLoadGuardState(limitConfig);
+ LoadGuardState loadGuardState = buildLoadGuardState(baseLimitConfig);
List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
@@ -192,23 +197,14 @@
&& stationProtocol.isLoading()
&& stationProtocol.getTaskNo() == 0
) {
- Integer moveStaNo = wrkMast.getStaNo();
+ Integer moveStaNo = resolveDispatchOutOrderTarget(
+ stationProtocol.getStationId(),
+ wrkMast.getStaNo(),
+ outOrderList,
+ true
+ );
- if (!outOrderList.isEmpty()) {
- List<NavigateNode> nodes = navigateUtils.calcByStationId(stationProtocol.getStationId(), wrkMast.getStaNo());
- for (int i = nodes.size() - 1; i >= 0; i--) {
- NavigateNode node = nodes.get(i);
- JSONObject v = JSONObject.parseObject(node.getNodeValue());
- if (v != null) {
- Integer stationId = v.getInteger("stationId");
- if (outOrderList.contains(stationId)) {
- moveStaNo = stationId;
- break;
- }
- }
- }
- }
-
+ DispatchLimitConfig limitConfig = getDispatchLimitConfig(stationProtocol.getStationId(), moveStaNo);
LoopHitResult loopHitResult = findPathLoopHit(limitConfig, stationProtocol.getStationId(), moveStaNo, loadGuardState);
if (isDispatchBlocked(limitConfig, currentStationTaskCountRef[0], loadGuardState, loopHitResult.isThroughLoop())) {
@@ -538,6 +534,7 @@
}
Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
List<StationObjModel> orderList = basDevp.getOutOrderList$();
+ List<Integer> outOrderStationIds = basDevp.getOutOrderIntList();
for (StationObjModel stationObjModel : orderList) {
StationProtocol stationProtocol = statusMap.get(stationObjModel.getStationId());
if (stationProtocol == null) {
@@ -562,6 +559,10 @@
WrkMast wrkMast = wrkMastService.selectByWorkNo(stationProtocol.getTaskNo());
if (wrkMast == null) {
+ continue;
+ }
+
+ if (isWatchingCircleArrival(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
continue;
}
@@ -609,29 +610,17 @@
News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
continue;
}
+ if (!tryAcquireOutOrderDispatchLock(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
+ continue;
+ }
+ clearWatchCircleCommand(wrkMast.getWrkNo());
MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
News.info("{}浠诲姟鐩存帴鍘荤洰鏍囩偣", wrkMast.getWrkNo());
} else if (commandType.equals("toCircle")) {
- Integer circleTarget = null;
- for (NavigateNode node : initPath) {
- JSONObject v = JSONObject.parseObject(node.getNodeValue());
- if (v != null) {
- Integer stationId = v.getInteger("stationId");
- try {
- List<NavigateNode> enableMovePath = navigateUtils.calcByStationId(stationProtocol.getStationId(), stationId);
- if (enableMovePath.isEmpty()) {
- continue;
- }
- } catch (Exception e) {
- continue;
- }
-
- circleTarget = stationId;
- break;
- }
- }
+ Integer circleTarget = resolveNextCircleOrderTarget(stationProtocol.getStationId(), outOrderStationIds);
if (circleTarget == null) {
+ News.taskInfo(wrkMast.getWrkNo(), "鏈壘鍒板彲鎵ц鐨勪笅涓�鎺掑簭妫�娴嬬偣锛屽綋鍓嶇珯鐐�={}", stationProtocol.getStationId());
continue;
}
@@ -640,8 +629,11 @@
News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
continue;
}
+ if (!tryAcquireOutOrderDispatchLock(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
+ continue;
+ }
MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
- redisUtil.set(RedisKeyType.WATCH_CIRCLE_STATION_.key + wrkMast.getWrkNo(), JSON.toJSONString(command, SerializerFeature.DisableCircularReferenceDetect), 60 * 60 * 24);
+ saveWatchCircleCommand(wrkMast.getWrkNo(), command);
News.info("{}浠诲姟杩涜缁曞湀", wrkMast.getWrkNo());
}
}
@@ -672,12 +664,10 @@
continue;
}
- Object circleObj = redisUtil.get(RedisKeyType.WATCH_CIRCLE_STATION_.key + stationProtocol.getTaskNo());
- if (circleObj == null) {
+ StationCommand circleCommand = getWatchCircleCommand(stationProtocol.getTaskNo());
+ if (circleCommand == null) {
continue;
}
-
- StationCommand circleCommand = JSON.parseObject(circleObj.toString(), StationCommand.class);
if (!stationProtocol.getStationId().equals(circleCommand.getTargetStaNo())) {
continue;
}
@@ -687,27 +677,25 @@
continue;
}
- Integer moveStaNo = wrkMast.getStaNo();
-
- if (!outOrderList.isEmpty()) {
- List<NavigateNode> nodes = navigateUtils.calcByStationId(stationProtocol.getStationId(), wrkMast.getStaNo());
- for (int i = nodes.size() - 1; i >= 0; i--) {
- NavigateNode node = nodes.get(i);
- JSONObject v = JSONObject.parseObject(node.getNodeValue());
- if (v != null) {
- Integer stationId = v.getInteger("stationId");
- if (outOrderList.contains(stationId)) {
- moveStaNo = stationId;
- break;
- }
- }
- }
- }
+ Integer moveStaNo = resolveDispatchOutOrderTarget(
+ stationProtocol.getStationId(),
+ wrkMast.getStaNo(),
+ outOrderList,
+ true
+ );
StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), moveStaNo, 0);
if (command == null) {
News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
continue;
+ }
+ if (!tryAcquireOutOrderDispatchLock(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
+ continue;
+ }
+ if (Objects.equals(moveStaNo, wrkMast.getStaNo())) {
+ clearWatchCircleCommand(wrkMast.getWrkNo());
+ } else {
+ saveWatchCircleCommand(wrkMast.getWrkNo(), command);
}
MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
}
@@ -722,6 +710,106 @@
list.addAll(orderList);
}
return list;
+ }
+
+ private Integer resolveDispatchOutOrderTarget(Integer currentStationId,
+ Integer finalTargetStationId,
+ List<Integer> outOrderList,
+ boolean skipCurrentStation) {
+ if (finalTargetStationId == null) {
+ return null;
+ }
+ if (currentStationId == null || outOrderList == null || outOrderList.isEmpty()) {
+ return finalTargetStationId;
+ }
+
+ try {
+ List<NavigateNode> nodes = navigateUtils.calcByStationId(currentStationId, finalTargetStationId);
+ for (int i = nodes.size() - 1; i >= 0; i--) {
+ Integer stationId = getStationIdFromNode(nodes.get(i));
+ if (stationId == null) {
+ continue;
+ }
+ if (skipCurrentStation && currentStationId.equals(stationId)) {
+ continue;
+ }
+ if (outOrderList.contains(stationId)) {
+ return stationId;
+ }
+ }
+ } catch (Exception ignore) {}
+ return finalTargetStationId;
+ }
+
+ private Integer resolveNextCircleOrderTarget(Integer currentStationId, List<Integer> orderedOutStationList) {
+ if (currentStationId == null || orderedOutStationList == null || orderedOutStationList.size() <= 1) {
+ return null;
+ }
+
+ int startIndex = orderedOutStationList.indexOf(currentStationId);
+ int total = orderedOutStationList.size();
+ for (int offset = 1; offset < total; offset++) {
+ int candidateIndex = (startIndex + offset + total) % total;
+ Integer candidateStationId = orderedOutStationList.get(candidateIndex);
+ if (candidateStationId == null || currentStationId.equals(candidateStationId)) {
+ continue;
+ }
+ try {
+ List<NavigateNode> path = navigateUtils.calcByStationId(currentStationId, candidateStationId);
+ if (path != null && !path.isEmpty()) {
+ return candidateStationId;
+ }
+ } catch (Exception ignore) {}
+ }
+ return null;
+ }
+
+ private boolean tryAcquireOutOrderDispatchLock(Integer wrkNo, Integer stationId) {
+ if (wrkNo == null || wrkNo <= 0 || stationId == null) {
+ return true;
+ }
+ String key = RedisKeyType.STATION_OUT_ORDER_DISPATCH_LIMIT_.key + wrkNo + "_" + stationId;
+ Object lock = redisUtil.get(key);
+ if (lock != null) {
+ return false;
+ }
+ redisUtil.set(key, "lock", OUT_ORDER_DISPATCH_LIMIT_SECONDS);
+ return true;
+ }
+
+ private boolean isWatchingCircleArrival(Integer wrkNo, Integer stationId) {
+ StationCommand command = getWatchCircleCommand(wrkNo);
+ return command != null && stationId != null && stationId.equals(command.getTargetStaNo());
+ }
+
+ private StationCommand getWatchCircleCommand(Integer wrkNo) {
+ if (wrkNo == null || wrkNo <= 0) {
+ return null;
+ }
+ Object circleObj = redisUtil.get(RedisKeyType.WATCH_CIRCLE_STATION_.key + wrkNo);
+ if (circleObj == null) {
+ return null;
+ }
+ try {
+ return JSON.parseObject(circleObj.toString(), StationCommand.class);
+ } catch (Exception ignore) {
+ return null;
+ }
+ }
+
+ private void saveWatchCircleCommand(Integer wrkNo, StationCommand command) {
+ if (wrkNo == null || wrkNo <= 0 || command == null) {
+ return;
+ }
+ redisUtil.set(RedisKeyType.WATCH_CIRCLE_STATION_.key + wrkNo,
+ JSON.toJSONString(command, SerializerFeature.DisableCircularReferenceDetect), 60 * 60 * 24);
+ }
+
+ private void clearWatchCircleCommand(Integer wrkNo) {
+ if (wrkNo == null || wrkNo <= 0) {
+ return;
+ }
+ redisUtil.del(RedisKeyType.WATCH_CIRCLE_STATION_.key + wrkNo);
}
public Integer getOutStationBatchSeq(List<NavigateNode> pathList, Integer searchStationId, String searchBatch) {
@@ -823,7 +911,8 @@
}
state.totalStationCount = toNonNegative(capacityVo.getTotalStationCount());
- state.projectedTaskStationCount = toNonNegative(capacityVo.getTaskStationCount());
+ Integer occupiedStationCount = capacityVo.getOccupiedStationCount();
+ state.projectedTaskStationCount = toNonNegative(occupiedStationCount != null ? occupiedStationCount : capacityVo.getTaskStationCount());
List<StationCycleLoopVo> loopList = capacityVo.getLoopList();
if (loopList != null) {
@@ -916,23 +1005,31 @@
redisUtil.expire(RedisKeyType.STATION_CYCLE_LOAD_RESERVE.key, LOOP_LOAD_RESERVE_EXPIRE_SECONDS);
}
- private DispatchLimitConfig getDispatchLimitConfig() {
+ private DispatchLimitConfig getDispatchLimitConfig(Integer startStationId, Integer endStationId) {
DispatchLimitConfig config = new DispatchLimitConfig();
Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
- if (!(systemConfigMapObj instanceof Map)) {
- return config;
+ if (systemConfigMapObj instanceof Map) {
+ Map<?, ?> systemConfigMap = (Map<?, ?>) systemConfigMapObj;
+ config.circleMaxLoadLimit = parseLoadLimit(getConfigValue(systemConfigMap, "circleMaxLoadLimit"), config.circleMaxLoadLimit);
+ String loopModeValue = getConfigValue(systemConfigMap, "circleLoopModeEnable");
+ if (isBlank(loopModeValue)) {
+ loopModeValue = getConfigValue(systemConfigMap, "circleModeEnable");
+ }
+ if (isBlank(loopModeValue)) {
+ loopModeValue = getConfigValue(systemConfigMap, "isCircleMode");
+ }
+ config.loopModeEnable = parseBoolean(loopModeValue, config.loopModeEnable);
}
- Map<?, ?> systemConfigMap = (Map<?, ?>) systemConfigMapObj;
- config.circleMaxLoadLimit = parseLoadLimit(getConfigValue(systemConfigMap, "circleMaxLoadLimit"), config.circleMaxLoadLimit);
- String loopModeValue = getConfigValue(systemConfigMap, "circleLoopModeEnable");
- if (isBlank(loopModeValue)) {
- loopModeValue = getConfigValue(systemConfigMap, "circleModeEnable");
+ if (stationPathPolicyService != null && startStationId != null && endStationId != null) {
+ try {
+ StationPathResolvedPolicy resolvedPolicy = stationPathPolicyService.resolvePolicy(startStationId, endStationId);
+ if (resolvedPolicy != null && resolvedPolicy.getProfileConfig() != null) {
+ config.circleMaxLoadLimit = parseLoadLimit(String.valueOf(resolvedPolicy.getProfileConfig().getCircleMaxLoadLimit()), config.circleMaxLoadLimit);
+ }
+ } catch (Exception ignore) {
+ }
}
- if (isBlank(loopModeValue)) {
- loopModeValue = getConfigValue(systemConfigMap, "isCircleMode");
- }
- config.loopModeEnable = parseBoolean(loopModeValue, config.loopModeEnable);
return config;
}
--
Gitblit v1.9.1