From 3e28500e76ffd71b7da90f40d1f3126c00a0e5f0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 13 四月 2026 14:49:41 +0800
Subject: [PATCH] #站点运行优化
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 210 ++++++++++++++++++++++++++--------------------------
1 files changed, 104 insertions(+), 106 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 3950d8b..8f4dd67 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -1,16 +1,24 @@
package com.zy.core.utils;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.utils.Utils;
import com.zy.asrs.service.*;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.dispatch.StationCommandDispatcher;
+import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.StationCommandType;
import com.zy.core.enums.WrkIoType;
import com.zy.core.enums.WrkStsType;
import com.zy.core.model.StationObjModel;
+import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.task.MainProcessLane;
import com.zy.core.task.MainProcessTaskSubmitter;
@@ -26,10 +34,11 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
@Component
public class StationOperateProcessUtils {
+ private static final String STATION_COMMAND_SOURCE = "station-operate-process";
+
@Autowired
private WrkMastService wrkMastService;
@Autowired
@@ -52,10 +61,104 @@
private StationOutboundDecisionSupport stationOutboundDecisionSupport;
@Autowired
private BasCrnpService basCrnpService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private StationCommandDispatcher stationCommandDispatcher;
+
+ public void submitStationEnableInTasks(long minIntervalMs) {
+ submitStationEnableInTasks(MainProcessLane.STATION_ENABLE_IN, minIntervalMs);
+ }
+
+ public void submitStationEnableInTasks(MainProcessLane lane,
+ long minIntervalMs) {
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
+ for (BasDevp basDevp : basDevps) {
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
+ if (stationThread == null) {
+ continue;
+ }
+ Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
+ if (stationMap == null || stationMap.isEmpty()) {
+ continue;
+ }
+ for (StationObjModel stationObjModel : basDevp.getInStationList$()) {
+ Integer stationId = stationObjModel == null ? null : stationObjModel.getStationId();
+ if (stationId == null || !stationMap.containsKey(stationId)) {
+ continue;
+ }
+ mainProcessTaskSubmitter.submitKeyedSerialTask(
+ lane,
+ stationId,
+ "stationEnableInExecute",
+ minIntervalMs,
+ () -> stationEnableInExecute(basDevp, stationObjModel)
+ );
+ }
+ }
+ }
// 鎵ц鍗曚釜绔欑偣鐨勫叆搴撲换鍔′笅鍙�
public void stationInExecute(BasDevp basDevp, StationObjModel stationObjModel) {
stationRegularDispatchProcessor.stationInExecute(basDevp, stationObjModel);
+ }
+
+ // 鎵ц鍗曚釜绔欑偣鐨勫惎鍔ㄥ叆搴撲笅鍙�
+ public void stationEnableInExecute(BasDevp basDevp, StationObjModel stationObjModel) {
+ if (basDevp == null || stationObjModel == null || stationObjModel.getStationId() == null) {
+ return;
+ }
+
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
+ if (stationThread == null) {
+ return;
+ }
+
+ Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
+ if (stationMap == null || stationMap.isEmpty()) {
+ return;
+ }
+
+ Integer stationId = stationObjModel.getStationId();
+ if (!stationMap.containsKey(stationId)) {
+ return;
+ }
+
+ StationProtocol stationProtocol = stationMap.get(stationId);
+ if (stationProtocol == null) {
+ return;
+ }
+
+ Object lock = redisUtil.get(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId);
+ if (lock != null) {
+ return;
+ }
+
+ if (!stationProtocol.isAutoing()
+ || !stationProtocol.isLoading()
+ || stationProtocol.getTaskNo() != 0
+ || !stationProtocol.isEnableIn()) {
+ return;
+ }
+
+ Integer backStationId = stationObjModel.getBarcodeStation() == null ? null : stationObjModel.getBarcodeStation().getStationId();
+ if (backStationId == null) {
+ return;
+ }
+
+ StationCommand command = stationThread.getCommand(
+ StationCommandType.MOVE,
+ commonService.getWorkNo(WrkIoType.ENABLE_IN.id),
+ stationId,
+ backStationId,
+ 0
+ );
+ stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, STATION_COMMAND_SOURCE, "enable-in");
+ Utils.precomputeInTaskEnableRow(backStationId);
+ redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 15);
+ News.info("{}绔欑偣鍚姩鍏ュ簱鎴愬姛锛屾暟鎹寘:{}", stationId, JSON.toJSONString(command));
}
// 鎵ц鍗曚釜鍑哄簱浠诲姟瀵瑰簲鐨勮緭閫佺珯鐐逛笅鍙�
@@ -110,11 +213,6 @@
stationRerouteProcessor.checkStationRunBlock(basDevp, stationId);
}
- // 妫�娴嬪崟涓珯鐐逛换鍔″仠鐣欒秴鏃跺悗鐨勬仮澶嶅鐞�
- public void checkStationIdleRecover(BasDevp basDevp, Integer stationId) {
- stationRerouteProcessor.checkStationIdleRecover(basDevp, stationId);
- }
-
//鑾峰彇杈撻�佺嚎浠诲姟鏁伴噺
public int getCurrentStationTaskCount() {
return stationDispatchLoadSupport.countCurrentStationTask();
@@ -136,11 +234,6 @@
// 妫�娴嬪崟涓珯鐐圭殑鍑哄簱鎺掑簭
public void checkStationOutOrder(BasDevp basDevp, StationObjModel stationObjModel) {
stationRerouteProcessor.checkStationOutOrder(basDevp, stationObjModel);
- }
-
- // 鐩戞帶鍗曚釜缁曞湀绔欑偣
- public void watchCircleStation(BasDevp basDevp, Integer stationId) {
- stationRerouteProcessor.watchCircleStation(basDevp, stationId);
}
public void submitStationInTasks(long minIntervalMs) {
@@ -329,40 +422,6 @@
}
}
- public void submitWatchCircleStationTasks(long minIntervalMs) {
- submitWatchCircleStationTasks(MainProcessLane.STATION_WATCH_CIRCLE, minIntervalMs);
- }
-
- public void submitWatchCircleStationTasks(MainProcessLane lane, long minIntervalMs) {
- List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
- for (BasDevp basDevp : basDevps) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
- if (stationThread == null) {
- continue;
- }
- for (StationProtocol stationProtocol : stationThread.getStatus()) {
- Integer stationId = stationProtocol == null ? null : stationProtocol.getStationId();
- if (stationId == null) {
- continue;
- }
- if (!stationProtocol.isAutoing()
- || !stationProtocol.isLoading()
- || stationProtocol.getTaskNo() <= 0
- || !stationOutboundDecisionSupport.isWatchingCircleArrival(stationProtocol.getTaskNo(), stationProtocol.getStationId())) {
- continue;
- }
-
- mainProcessTaskSubmitter.submitKeyedSerialTask(
- lane,
- stationId,
- "watchCircleStation",
- minIntervalMs,
- () -> watchCircleStation(basDevp, stationId)
- );
- }
- }
- }
-
public void submitCheckStationRunBlockTasks(long minIntervalMs) {
submitCheckStationRunBlockTasks(MainProcessLane.STATION_RUN_BLOCK, minIntervalMs);
}
@@ -396,42 +455,6 @@
}
}
- public void submitCheckStationIdleRecoverTasks(long minIntervalMs) {
- submitCheckStationIdleRecoverTasks(MainProcessLane.STATION_IDLE_RECOVER, minIntervalMs);
- }
-
- public void submitCheckStationIdleRecoverTasks(MainProcessLane lane, long minIntervalMs) {
- List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
- for (BasDevp basDevp : basDevps) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
- if (stationThread == null) {
- continue;
- }
- for (StationProtocol stationProtocol : stationThread.getStatus()) {
- Integer stationId = stationProtocol == null ? null : stationProtocol.getStationId();
- if (stationId == null) {
- continue;
- }
- if (!isIdleRecoverCandidateStation(basDevp, stationId)) {
- continue;
- }
- if (!stationProtocol.isAutoing()
- || !stationProtocol.isLoading()
- || stationProtocol.getTaskNo() <= 0
- || stationProtocol.isRunBlock()) {
- continue;
- }
- mainProcessTaskSubmitter.submitKeyedSerialTask(
- lane,
- stationId,
- "checkStationIdleRecover",
- minIntervalMs,
- () -> checkStationIdleRecover(basDevp, stationId)
- );
- }
- }
- }
-
RerouteCommandPlan buildRerouteCommandPlan(RerouteContext context,
RerouteDecision decision) {
return stationRerouteProcessor.buildRerouteCommandPlan(context, decision);
@@ -450,31 +473,6 @@
Integer stationId,
List<Integer> runBlockReassignLocStationList) {
return stationRerouteProcessor.shouldUseRunBlockDirectReassign(wrkMast, stationId, runBlockReassignLocStationList);
- }
-
- public boolean isIdleRecoverCandidateStation(BasDevp basDevp, Integer stationId) {
- if (basDevp == null || stationId == null) {
- return false;
- }
- return !containsStation(basDevp.getBarcodeStationList$(), stationId)
- && !containsStation(basDevp.getInStationList$(), stationId)
- && !containsStation(basDevp.getOutStationList$(), stationId);
- }
-
- private boolean containsStation(List<StationObjModel> stationList, Integer stationId) {
- if (stationList == null || stationList.isEmpty() || stationId == null) {
- return false;
- }
- for (StationObjModel stationObjModel : stationList) {
- if (stationObjModel != null && Objects.equals(stationObjModel.getStationId(), stationId)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean shouldSkipIdleRecoverForRecentDispatch(Integer taskNo, Integer stationId) {
- return stationRerouteProcessor.shouldSkipIdleRecoverForRecentDispatch(taskNo, stationId);
}
public void attemptClearTaskPath(StationThread stationThread, Integer taskNo) {
--
Gitblit v1.9.1