From d719e394fa5733621e99768821157feb2e251718 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 16:33:01 +0800
Subject: [PATCH] #优化运行速度
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 147 ++++++++++++++++++++++++------------------------
1 files changed, 73 insertions(+), 74 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 0a9a7a3..2662e7b 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -1,13 +1,10 @@
package com.zy.core.utils;
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.BasStation;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.BasStationService;
-import com.zy.asrs.service.WrkAnalysisService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -18,10 +15,7 @@
import com.zy.core.task.MainProcessLane;
import com.zy.core.task.MainProcessTaskSubmitter;
import com.zy.core.thread.StationThread;
-import com.zy.core.utils.station.StationDispatchLoadSupport;
-import com.zy.core.utils.station.StationOutboundDispatchProcessor;
-import com.zy.core.utils.station.StationRegularDispatchProcessor;
-import com.zy.core.utils.station.StationRerouteProcessor;
+import com.zy.core.utils.station.*;
import com.zy.core.utils.station.model.RerouteCommandPlan;
import com.zy.core.utils.station.model.RerouteContext;
import com.zy.core.utils.station.model.RerouteDecision;
@@ -53,6 +47,10 @@
private StationRerouteProcessor stationRerouteProcessor;
@Autowired
private MainProcessTaskSubmitter mainProcessTaskSubmitter;
+ @Autowired
+ private StationOutboundDecisionSupport stationOutboundDecisionSupport;
+ @Autowired
+ private BasCrnpService basCrnpService;
//鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
public synchronized void stationInExecute() {
@@ -89,62 +87,25 @@
stationRegularDispatchProcessor.stationOutExecuteFinish(wrkMast);
}
- // 妫�娴嬪叆搴撲换鍔℃槸鍚﹀埌杈剧珯鍙板苟杞负绔欏彴杩愯瀹屾垚
- public synchronized void scanInboundStationArrival() {
- List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
- .eq("io_type", 1)
- .eq("wrk_sts", WrkStsType.INBOUND_STATION_RUN.sts)
- .isNotNull("sta_no"));
- for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast == null || wrkMast.getWrkNo() == null || wrkMast.getStaNo() == null) {
- continue;
- }
- BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>()
- .eq("station_id", wrkMast.getStaNo())
- .last("limit 1"));
- if (basStation == null || basStation.getDeviceNo() == null) {
- continue;
- }
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
- if (stationThread == null) {
- continue;
- }
- Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
- StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(basStation.getStationId());
- boolean arrived = stationProtocol != null
- && wrkMast.getWrkNo().equals(stationProtocol.getTaskNo())
- && stationProtocol.isLoading();
- if (!arrived && !stationThread.hasRecentArrival(basStation.getStationId(), wrkMast.getWrkNo())) {
- continue;
- }
- boolean updated = wrkAnalysisService.completeInboundStationRun(wrkMast, new Date());
- if (updated) {
- News.info("鍏ュ簱绔欑偣鍒拌揪鎵弿鍛戒腑锛屽伐浣滃彿={}锛岀洰鏍囩珯={}", wrkMast.getWrkNo(), wrkMast.getStaNo());
- }
- }
- }
-
// 妫�娴嬪崟涓叆搴撲换鍔℃槸鍚﹀埌杈剧洰鏍囩珯鍙�
- public void scanInboundStationArrival(WrkMast wrkMast) {
- if (wrkMast == null || wrkMast.getWrkNo() == null || wrkMast.getStaNo() == null) {
+ public void scanInboundStationArrival(StationObjModel stationObjModel) {
+ if (stationObjModel == null) {
return;
}
- BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>()
- .eq("station_id", wrkMast.getStaNo())
- .last("limit 1"));
- if (basStation == null || basStation.getDeviceNo() == null) {
- return;
- }
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
if (stationThread == null) {
return;
}
Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
- StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(basStation.getStationId());
- boolean arrived = stationProtocol != null
- && wrkMast.getWrkNo().equals(stationProtocol.getTaskNo())
- && stationProtocol.isLoading();
- if (!arrived && !stationThread.hasRecentArrival(basStation.getStationId(), wrkMast.getWrkNo())) {
+ StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(stationObjModel.getStationId());
+ if (stationProtocol == null) {
+ return;
+ }
+ if (stationProtocol.getTaskNo() <= 0) {
+ return;
+ }
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(stationProtocol.getTaskNo());
+ if (wrkMast == null) {
return;
}
boolean updated = wrkAnalysisService.completeInboundStationRun(wrkMast, new Date());
@@ -154,7 +115,7 @@
}
// 妫�娴嬩换鍔¤浆瀹屾垚
- public synchronized void checkTaskToComplete() {
+ public void checkTaskToComplete() {
stationRegularDispatchProcessor.checkTaskToComplete();
}
@@ -164,7 +125,7 @@
}
//妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
- public synchronized void checkStationRunBlock() {
+ public void checkStationRunBlock() {
stationRerouteProcessor.checkStationRunBlock();
}
@@ -174,7 +135,7 @@
}
//妫�娴嬭緭閫佺珯鐐逛换鍔″仠鐣欒秴鏃跺悗閲嶆柊璁＄畻璺緞
- public synchronized void checkStationIdleRecover() {
+ public void checkStationIdleRecover() {
stationRerouteProcessor.checkStationIdleRecover();
}
@@ -188,7 +149,7 @@
return stationDispatchLoadSupport.countCurrentStationTask();
}
- public synchronized int getCurrentOutboundTaskCountByTargetStation(Integer stationId) {
+ public int getCurrentOutboundTaskCountByTargetStation(Integer stationId) {
if (stationId == null) {
return 0;
}
@@ -306,18 +267,22 @@
}
public void submitInboundStationArrivalTasks(MainProcessLane lane, long minIntervalMs) {
- List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
- .eq("io_type", 1)
- .eq("wrk_sts", WrkStsType.INBOUND_STATION_RUN.sts)
- .isNotNull("sta_no"));
- for (WrkMast wrkMast : wrkMasts) {
- mainProcessTaskSubmitter.submitKeyedSerialTask(
- lane,
- wrkMast.getStaNo(),
- "scanInboundStationArrival",
- minIntervalMs,
- () -> scanInboundStationArrival(wrkMast)
- );
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
+ for (BasCrnp basCrnp : basCrnps) {
+ Integer crnNo = basCrnp == null ? null : basCrnp.getCrnNo();
+ if (crnNo == null) {
+ continue;
+ }
+
+ for (StationObjModel stationObjModel : basCrnp.getInStationList$()) {
+ mainProcessTaskSubmitter.submitKeyedSerialTask(
+ lane,
+ stationObjModel.getStationId(),
+ "scanInboundStationArrival",
+ minIntervalMs,
+ () -> scanInboundStationArrival(stationObjModel)
+ );
+ }
}
}
@@ -347,9 +312,24 @@
public void submitCheckStationOutOrderTasks(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 (StationObjModel stationObjModel : basDevp.getOutOrderList$()) {
Integer stationId = stationObjModel == null ? null : stationObjModel.getStationId();
if (stationId == null) {
+ continue;
+ }
+ Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
+ StationProtocol stationProtocol = statusMap.get(stationId);
+ if (stationProtocol == null
+ || !stationProtocol.isAutoing()
+ || !stationProtocol.isLoading()
+ || stationProtocol.getTaskNo() <= 0
+ || stationProtocol.isRunBlock()
+ || !stationProtocol.getStationId().equals(stationProtocol.getTargetStaNo())) {
continue;
}
mainProcessTaskSubmitter.submitKeyedSerialTask(
@@ -379,6 +359,13 @@
if (stationId == null) {
continue;
}
+ if (!stationProtocol.isAutoing()
+ || !stationProtocol.isLoading()
+ || stationProtocol.getTaskNo() <= 0
+ || !stationOutboundDecisionSupport.isWatchingCircleArrival(stationProtocol.getTaskNo(), stationProtocol.getStationId())) {
+ continue;
+ }
+
mainProcessTaskSubmitter.submitKeyedSerialTask(
lane,
stationId,
@@ -406,6 +393,12 @@
if (stationId == null) {
continue;
}
+ if (!stationProtocol.isAutoing()
+ || !stationProtocol.isLoading()
+ || stationProtocol.getTaskNo() <= 0
+ || !stationProtocol.isRunBlock()) {
+ continue;
+ }
mainProcessTaskSubmitter.submitKeyedSerialTask(
lane,
stationId,
@@ -433,6 +426,12 @@
if (stationId == null) {
continue;
}
+ if (!stationProtocol.isAutoing()
+ || !stationProtocol.isLoading()
+ || stationProtocol.getTaskNo() <= 0
+ || stationProtocol.isRunBlock()) {
+ continue;
+ }
mainProcessTaskSubmitter.submitKeyedSerialTask(
lane,
stationId,
--
Gitblit v1.9.1