From 10bdc4b6e9701befd1a83bccd2998dcc96cb2c43 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 四月 2026 12:07:38 +0800
Subject: [PATCH] fix: enforce auto tune agent tool safety
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 265 +++++++++++++++++++++++++++++-----------------------
1 files changed, 148 insertions(+), 117 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index b9ba6ae..75e9350 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,9 +34,12 @@
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
@@ -51,10 +62,43 @@
private StationOutboundDecisionSupport stationOutboundDecisionSupport;
@Autowired
private BasCrnpService basCrnpService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private StationCommandDispatcher stationCommandDispatcher;
- //鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
- public synchronized void stationInExecute() {
- stationRegularDispatchProcessor.stationInExecute();
+ 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)
+ );
+ }
+ }
}
// 鎵ц鍗曚釜绔欑偣鐨勫叆搴撲换鍔′笅鍙�
@@ -62,9 +106,62 @@
stationRegularDispatchProcessor.stationInExecute(basDevp, stationObjModel);
}
- //鎵ц鍫嗗灈鏈鸿緭閫佺珯鐐瑰嚭搴撲换鍔�
- public synchronized void crnStationOutExecute() {
- stationOutboundDispatchProcessor.crnStationOutExecute();
+ // 鎵ц鍗曚釜绔欑偣鐨勫惎鍔ㄥ叆搴撲笅鍙�
+ 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 barcodeStationId = stationObjModel.getBarcodeStation() == null ? null : stationObjModel.getBarcodeStation().getStationId();
+ if (barcodeStationId == null) {
+ return;
+ }
+
+ StationCommand command = stationThread.getCommand(
+ StationCommandType.MOVE,
+ commonService.getWorkNo(WrkIoType.ENABLE_IN.id),
+ stationId,
+ barcodeStationId,
+ 0
+ );
+ stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, STATION_COMMAND_SOURCE, "enable-in");
+ Utils.precomputeInTaskEnableRow(barcodeStationId);
+ redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 15);
+ // 鍚姩鍏ュ簱鏃跺垹闄ら��鍥炴帶鍒秌ey锛屽厑璁稿悗缁紓甯告椂鍐嶆鐢熸垚閫�鍥炲懡浠�
+ redisUtil.del(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + barcodeStationId);
+ News.info("{}绔欑偣鍚姩鍏ュ簱鎴愬姛锛屾暟鎹寘:{}", stationId, JSON.toJSONString(command));
}
// 鎵ц鍗曚釜鍑哄簱浠诲姟瀵瑰簲鐨勮緭閫佺珯鐐逛笅鍙�
@@ -72,9 +169,9 @@
stationOutboundDispatchProcessor.crnStationOutExecute(wrkMast);
}
- //鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
- public synchronized void dualCrnStationOutExecute() {
- stationOutboundDispatchProcessor.dualCrnStationOutExecute();
+ // 鎵ц鍗曚釜鍙屽伐浣嶅嚭搴撲换鍔″搴旂殑杈撻�佺珯鐐逛笅鍙�
+ public void dualCrnStationOutExecute(WrkMast wrkMast) {
+ stationOutboundDispatchProcessor.dualCrnStationOutExecute(wrkMast);
}
// 妫�娴嬪崟涓嚭搴撲换鍔℃槸鍚﹀埌杈剧洰鏍囩珯鍙�
@@ -103,15 +200,25 @@
if (wrkMast == null) {
return;
}
+ if (!Objects.equals(wrkMast.getStaNo(), stationObjModel.getStationId())) {
+ News.info("鍏ュ簱绔欑偣鍒拌揪鎵弿蹇界暐锛屽伐浣滃彿={}锛屾壂鎻忕珯鐐�={}锛屼换鍔＄洰鏍囩珯={}锛屽師鍥�=target_mismatch",
+ wrkMast.getWrkNo(), stationObjModel.getStationId(), wrkMast.getStaNo());
+ return;
+ }
+ if (!Objects.equals(wrkMast.getWrkSts(), WrkStsType.INBOUND_STATION_RUN.sts)) {
+ News.info("鍏ュ簱绔欑偣鍒拌揪鎵弿蹇界暐锛屽伐浣滃彿={}锛屾壂鎻忕珯鐐�={}锛屼换鍔＄姸鎬�={}锛屽師鍥�=wrk_sts_mismatch",
+ wrkMast.getWrkNo(), stationObjModel.getStationId(), wrkMast.getWrkSts());
+ return;
+ }
+ News.info("鍏ュ簱绔欑偣鍒拌揪鎵弿鍛戒腑锛屽伐浣滃彿={}锛屾壂鎻忕珯鐐�={}锛岀洰鏍囩珯={}锛岀珯鐐箃askNo={}锛屽噯澶囪浆鐘舵��3",
+ wrkMast.getWrkNo(), stationObjModel.getStationId(), wrkMast.getStaNo(), stationProtocol.getTaskNo());
boolean updated = wrkAnalysisService.completeInboundStationRun(wrkMast, new Date());
if (updated) {
- News.info("鍏ュ簱绔欑偣鍒拌揪鎵弿鍛戒腑锛屽伐浣滃彿={}锛岀洰鏍囩珯={}", wrkMast.getWrkNo(), wrkMast.getStaNo());
+ News.info("鍏ュ簱绔欑偣鍒拌揪鎵弿瀹屾垚锛屽伐浣滃彿={}锛岀洰鏍囩珯={}锛岀粨鏋�=updated_to_3", wrkMast.getWrkNo(), wrkMast.getStaNo());
}
- }
-
- // 妫�娴嬩换鍔¤浆瀹屾垚
- public void checkTaskToComplete() {
- stationRegularDispatchProcessor.checkTaskToComplete();
+ else {
+ News.info("鍏ュ簱绔欑偣鍒拌揪鎵弿缁撴潫锛屽伐浣滃彿={}锛岀洰鏍囩珯={}锛岀粨鏋�=skip_update", wrkMast.getWrkNo(), wrkMast.getStaNo());
+ }
}
// 妫�娴嬪崟涓嚭搴撲换鍔℃槸鍚﹀彲浠ヨ浆瀹屾垚
@@ -119,24 +226,9 @@
stationRegularDispatchProcessor.checkTaskToComplete(wrkMast);
}
- //妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
- public void checkStationRunBlock() {
- stationRerouteProcessor.checkStationRunBlock();
- }
-
// 妫�娴嬪崟涓珯鐐规槸鍚﹁繍琛屽牭濉�
public void checkStationRunBlock(BasDevp basDevp, Integer stationId) {
stationRerouteProcessor.checkStationRunBlock(basDevp, stationId);
- }
-
- //妫�娴嬭緭閫佺珯鐐逛换鍔″仠鐣欒秴鏃跺悗閲嶆柊璁＄畻璺緞
- public void checkStationIdleRecover() {
- stationRerouteProcessor.checkStationIdleRecover();
- }
-
- // 妫�娴嬪崟涓珯鐐逛换鍔″仠鐣欒秴鏃跺悗鐨勬仮澶嶅鐞�
- public void checkStationIdleRecover(BasDevp basDevp, Integer stationId) {
- stationRerouteProcessor.checkStationIdleRecover(basDevp, stationId);
}
//鑾峰彇杈撻�佺嚎浠诲姟鏁伴噺
@@ -157,24 +249,9 @@
WrkStsType.STATION_RUN.sts));
}
- // 妫�娴嬪嚭搴撴帓搴�
- public synchronized void checkStationOutOrder() {
- stationRerouteProcessor.checkStationOutOrder();
- }
-
// 妫�娴嬪崟涓珯鐐圭殑鍑哄簱鎺掑簭
public void checkStationOutOrder(BasDevp basDevp, StationObjModel stationObjModel) {
stationRerouteProcessor.checkStationOutOrder(basDevp, stationObjModel);
- }
-
- // 鐩戞帶缁曞湀绔欑偣
- public synchronized void watchCircleStation() {
- stationRerouteProcessor.watchCircleStation();
- }
-
- // 鐩戞帶鍗曚釜缁曞湀绔欑偣
- public void watchCircleStation(BasDevp basDevp, Integer stationId) {
- stationRerouteProcessor.watchCircleStation(basDevp, stationId);
}
public void submitStationInTasks(long minIntervalMs) {
@@ -201,7 +278,9 @@
if (stationProtocol == null
|| !stationProtocol.isAutoing()
|| !stationProtocol.isLoading()
- || stationProtocol.getTaskNo() <= 0) {
+ || stationProtocol.getTaskNo() <= 0
+ || !stationProtocol.isInEnable()
+ ) {
continue;
}
mainProcessTaskSubmitter.submitKeyedSerialTask(
@@ -234,6 +313,29 @@
"crnStationOutExecute",
minIntervalMs,
() -> crnStationOutExecute(wrkMast)
+ );
+ }
+ }
+
+ public void submitDualCrnStationOutTasks(long minIntervalMs) {
+ submitDualCrnStationOutTasks(MainProcessLane.DUAL_STATION_OUT, minIntervalMs);
+ }
+
+ public void submitDualCrnStationOutTasks(MainProcessLane lane, long minIntervalMs) {
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
+ .eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
+ .isNotNull("dual_crn_no"));
+ for (WrkMast wrkMast : wrkMasts) {
+ Integer laneKey = wrkMast == null ? null : wrkMast.getSourceStaNo();
+ if (laneKey == null) {
+ laneKey = wrkMast == null ? null : wrkMast.getWrkNo();
+ }
+ mainProcessTaskSubmitter.submitKeyedSerialTask(
+ lane,
+ laneKey,
+ "dualCrnStationOutExecute",
+ minIntervalMs,
+ () -> dualCrnStationOutExecute(wrkMast)
);
}
}
@@ -338,40 +440,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);
}
@@ -405,39 +473,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 (!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);
@@ -456,10 +491,6 @@
Integer stationId,
List<Integer> runBlockReassignLocStationList) {
return stationRerouteProcessor.shouldUseRunBlockDirectReassign(wrkMast, stationId, runBlockReassignLocStationList);
- }
-
- private boolean shouldSkipIdleRecoverForRecentDispatch(Integer taskNo, Integer stationId) {
- return stationRerouteProcessor.shouldSkipIdleRecoverForRecentDispatch(taskNo, stationId);
}
public void attemptClearTaskPath(StationThread stationThread, Integer taskNo) {
--
Gitblit v1.9.1