From d16c9af7bb89a7e3abb4071003c63b3a6f6b9e4b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 四月 2026 14:45:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/station/StationRerouteProcessor.java | 68 ---------------------------------
1 files changed, 1 insertions(+), 67 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 6031758..985ab4c 100644
--- a/src/main/java/com/zy/core/utils/station/StationRerouteProcessor.java
+++ b/src/main/java/com/zy/core/utils/station/StationRerouteProcessor.java
@@ -75,26 +75,6 @@
@Autowired
private StationDispatchRuntimeStateSupport stationDispatchRuntimeStateSupport;
- public void checkStationRunBlock() {
- try {
- 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()) {
- if (stationProtocol == null || stationProtocol.getStationId() == null) {
- continue;
- }
- checkStationRunBlock(basDevp, stationProtocol.getStationId());
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
public void checkStationRunBlock(BasDevp basDevp, Integer stationId) {
try {
if (basDevp == null || basDevp.getDevpNo() == null || stationId == null) {
@@ -131,7 +111,7 @@
if (lock != null) {
return;
}
- redisUtil.set(RedisKeyType.CHECK_STATION_RUN_BLOCK_LIMIT_.key + stationProtocol.getTaskNo(), "lock", 15);
+ redisUtil.set(RedisKeyType.CHECK_STATION_RUN_BLOCK_LIMIT_.key + stationProtocol.getTaskNo(), "lock", 30);
if (shouldUseRunBlockDirectReassign(wrkMast, stationProtocol.getStationId(), runBlockReassignLocStationList)) {
executeRunBlockDirectReassign(basDevp, stationThread, stationProtocol, wrkMast);
@@ -153,26 +133,6 @@
.withCancelSessionBeforeDispatch()
.withResetSegmentCommandsBeforeDispatch();
executeSharedReroute(context);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void checkStationIdleRecover() {
- try {
- 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()) {
- if (stationProtocol != null && stationProtocol.getStationId() != null) {
- checkStationIdleRecover(basDevp, stationProtocol.getStationId());
- }
- }
- }
} catch (Exception e) {
e.printStackTrace();
}
@@ -202,16 +162,6 @@
checkStationIdleRecover(basDevp, stationThread, stationProtocol, basDevp.getOutOrderIntList());
} catch (Exception e) {
e.printStackTrace();
- }
- }
-
- public void checkStationOutOrder() {
- List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
- for (BasDevp basDevp : basDevps) {
- List<StationObjModel> orderList = basDevp.getOutOrderList$();
- for (StationObjModel stationObjModel : orderList) {
- checkStationOutOrder(basDevp, stationObjModel);
- }
}
}
@@ -262,22 +212,6 @@
executeSharedReroute(context);
} catch (Exception e) {
e.printStackTrace();
- }
- }
-
- public void watchCircleStation() {
- List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
- for (BasDevp basDevp : basDevps) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
- if (stationThread == null) {
- continue;
- }
- for (StationProtocol stationProtocol : stationThread.getStatus()) {
- if (stationProtocol == null || stationProtocol.getStationId() == null) {
- continue;
- }
- watchCircleStation(basDevp, stationProtocol.getStationId());
- }
}
}
--
Gitblit v1.9.1