From 1cb18ad19e48be2b944b005db1b950a667725fc6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 06 五月 2026 16:33:27 +0800
Subject: [PATCH] #log
---
src/main/java/com/zy/core/utils/station/StationRerouteProcessor.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/station/StationRerouteProcessor.java b/src/main/java/com/zy/core/utils/station/StationRerouteProcessor.java
index 45f4e22..f05dd91 100644
--- a/src/main/java/com/zy/core/utils/station/StationRerouteProcessor.java
+++ b/src/main/java/com/zy/core/utils/station/StationRerouteProcessor.java
@@ -83,15 +83,22 @@
private NavigateUtils navigateUtils;
public void checkStationRunBlock(BasDevp basDevp, Integer stationId) {
+ Integer taskNoForLog = null;
try {
if (basDevp == null || basDevp.getDevpNo() == null || stationId == null) {
+ log.warn("杈撻�佺珯鐐硅繍琛屽牭濉為噸瑙勫垝璺宠繃锛屽師鍥�=missing_input锛宒eviceNo={}锛宻tationId={}",
+ basDevp == null ? null : basDevp.getDevpNo(), stationId);
return;
}
if (shouldSkipRunBlockStation(basDevp, stationId)) {
+ log.info("杈撻�佺珯鐐硅繍琛屽牭濉為噸瑙勫垝璺宠繃锛屽師鍥�=skip_station锛宒eviceNo={}锛宻tationId={}",
+ basDevp.getDevpNo(), stationId);
return;
}
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
+ log.warn("杈撻�佺珯鐐硅繍琛屽牭濉為噸瑙勫垝璺宠繃锛屽師鍥�=missing_station_thread锛宒eviceNo={}锛宻tationId={}",
+ basDevp.getDevpNo(), stationId);
return;
}
@@ -102,8 +109,24 @@
|| !stationProtocol.isLoading()
|| stationProtocol.getTaskNo() <= 0
|| !stationProtocol.isRunBlock()) {
+ log.info("杈撻�佺珯鐐硅繍琛屽牭濉為噸瑙勫垝璺宠繃锛屽師鍥�=status_not_match锛宒eviceNo={}锛宻tationId={}锛宎utoing={}锛宭oading={}锛宼askNo={}锛宺unBlock={}锛宼argetStaNo={}",
+ basDevp.getDevpNo(),
+ stationId,
+ stationProtocol == null ? null : stationProtocol.isAutoing(),
+ stationProtocol == null ? null : stationProtocol.isLoading(),
+ stationProtocol == null ? null : stationProtocol.getTaskNo(),
+ stationProtocol == null ? null : stationProtocol.isRunBlock(),
+ stationProtocol == null ? null : stationProtocol.getTargetStaNo());
return;
}
+ taskNoForLog = stationProtocol.getTaskNo();
+ log.info("杈撻�佺珯鐐硅繍琛屽牭濉為噸瑙勫垝鍏ュ彛锛宒eviceNo={}锛宻tationId={}锛宼askNo={}锛宲rotocolTargetStaNo={}锛宼askWriteIdx={}锛宐ufferCommandCount={}",
+ basDevp.getDevpNo(),
+ stationProtocol.getStationId(),
+ taskNoForLog,
+ stationProtocol.getTargetStaNo(),
+ stationProtocol.getTaskWriteIdx(),
+ countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), taskNoForLog));
List<Integer> runBlockReassignLocStationList = new ArrayList<>();
for (StationObjModel stationObjModel : basDevp.getRunBlockReassignLocStationList$()) {
@@ -119,11 +142,18 @@
Object lock = redisUtil.get(RedisKeyType.CHECK_STATION_RUN_BLOCK_LIMIT_.key + stationProtocol.getTaskNo());
if (lock != null) {
+ log.info("杈撻�佺珯鐐硅繍琛屽牭濉為噸瑙勫垝璺宠繃锛屽師鍥�=limit_lock锛宒eviceNo={}锛宻tationId={}锛宼askNo={}",
+ basDevp.getDevpNo(), stationProtocol.getStationId(), stationProtocol.getTaskNo());
return;
}
redisUtil.set(RedisKeyType.CHECK_STATION_RUN_BLOCK_LIMIT_.key + stationProtocol.getTaskNo(), "lock", 30);
if (shouldUseRunBlockDirectReassign(wrkMast, stationProtocol.getStationId(), runBlockReassignLocStationList)) {
+ log.info("杈撻�佺珯鐐硅繍琛屽牭濉為噸瑙勫垝杩涘叆鐩村垎鏀紝deviceNo={}锛宻tationId={}锛宼askNo={}锛宺unBlockReassignStations={}",
+ basDevp.getDevpNo(),
+ stationProtocol.getStationId(),
+ stationProtocol.getTaskNo(),
+ JSON.toJSONString(runBlockReassignLocStationList));
if (stationMoveCoordinator != null) {
stationMoveCoordinator.withTaskDispatchLock(stationProtocol.getTaskNo(),
() -> {
@@ -150,9 +180,20 @@
.withSuppressDispatchGuard()
.withCancelSessionBeforeDispatch()
.withResetSegmentCommandsBeforeDispatch();
- executeSharedReroute(context);
+ RerouteExecutionResult result = executeSharedReroute(context);
+ log.info("杈撻�佺珯鐐硅繍琛屽牭濉為噸瑙勫垝缁撴潫锛宒eviceNo={}锛宻tationId={}锛宼askNo={}锛宻kipped={}锛宻kipReason={}锛宒ispatched={}锛宑learedCommandCount={}",
+ basDevp.getDevpNo(),
+ stationProtocol.getStationId(),
+ stationProtocol.getTaskNo(),
+ result == null ? null : result.skipped(),
+ result == null ? null : result.skipReason(),
+ result == null ? null : result.dispatched(),
+ result == null ? null : result.clearedCommandCount());
} catch (Exception e) {
- e.printStackTrace();
+ log.error("杈撻�佺珯鐐硅繍琛屽牭濉為噸瑙勫垝寮傚父锛宒eviceNo={}锛宻tationId={}锛宼askNo={}锛宔rror={}",
+ basDevp == null ? null : basDevp.getDevpNo(), stationId, taskNoForLog, e.toString());
+ log.error("checkStationRunBlock error, deviceNo={}, stationId={}, taskNo={}",
+ basDevp == null ? null : basDevp.getDevpNo(), stationId, taskNoForLog, e);
}
}
--
Gitblit v1.9.1