From 40b06f8935587ad582e70b8aec914fca3f12733a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 13:58:28 +0800
Subject: [PATCH] #优化运行速度
---
src/main/java/com/zy/core/plugin/GslProcess.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index 88b9b2f..ac2dbf7 100644
--- a/src/main/java/com/zy/core/plugin/GslProcess.java
+++ b/src/main/java/com/zy/core/plugin/GslProcess.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
+import com.zy.asrs.utils.Utils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.common.service.CommonService;
@@ -64,28 +65,37 @@
public void run() {
//妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
checkInStationHasTask();
- //鎸夌珯鐐规媶鍒嗙敓鎴愬叆搴撲换鍔★紝閬垮厤鍗曚釜绔欑偣闃诲鏁磋疆鎵弿
- submitGenerateStoreTasks();
+ //璇锋眰鐢熸垚鍏ュ簱浠诲姟锛屼繚鐣欐寜绔欑偣 lane 涓茶鎻愪氦
+ generateStoreWrkFile();
//鍫嗗灈鏈轰笌杈撻�佺珯鐐归兘鎸夊崟涓换鍔℃彁浜ゅ埌鍚勮嚜涓茶閫氶亾锛岄�愪釜鎵ц
+ // 鍫嗗灈鏈烘墽琛屽叆鍑哄簱涓绘祦绋�
submitCrnTask("crnIoExecute", DISPATCH_INTERVAL_MS, crnOperateUtils::crnIoExecute);
+ // 鍫嗗灈鏈烘敹灏惧苟鎺ㄨ繘鍚庣画鐘舵��
submitCrnTask("crnIoExecuteFinish", DISPATCH_INTERVAL_MS, crnOperateUtils::crnIoExecuteFinish);
+ // 杈撻�佺嚎鎵ц鍏ュ簱浠诲姟涓嬪彂
submitStationTask("stationInExecute", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::stationInExecute);
+ // 杈撻�佺嚎鎵ц鍫嗗灈鏈哄嚭搴撳悗鐨勭珯鍙版祦杞�
submitStationTask("crnStationOutExecute", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::crnStationOutExecute);
+ // 楂橀妫�娴嬪嚭搴撲换鍔℃槸鍚﹀凡缁忓埌杈剧洰鏍囩珯鍙�
+ submitStationTask("stationOutExecuteFinish", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::stationOutExecuteFinish);
+ // 楂橀妫�娴嬪叆搴撲换鍔℃槸鍚﹀凡缁忓埌杈剧洰鏍囩珯鍙�
+ submitStationTask("scanInboundStationArrival", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::scanInboundStationArrival);
+ // 妫�娴嬬珯鍙拌繍琛屽畬鎴愬悗鐨勪换鍔¤浆瀹屾垚
+ submitStationTask("checkTaskToComplete", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::checkTaskToComplete);
+ // 妫�娴嬪苟澶勭悊鍑哄簱鎺掑簭
submitStationTask("checkStationOutOrder", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationOutOrder);
+ // 鐩戞帶杈撻�佺嚎缁曞湀绔欑偣
submitStationTask("watchCircleStation", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::watchCircleStation);
+ // 妫�娴嬭緭閫佺嚎杩愯鍫靛
submitStationTask("checkStationRunBlock", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationRunBlock);
+ // 妫�娴嬬珯鍙扮┖闂茶秴鏃跺悗鐨勬仮澶嶅鐞�
submitStationTask("checkStationIdleRecover", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationIdleRecover);
}
@Override
public boolean matchCandidate(StoreInTaskContext context) {
- StationProtocol stationProtocol = context.getStationProtocol();
- return stationProtocol.isAutoing()
- && stationProtocol.isLoading()
- && stationProtocol.isInEnable()
- && stationProtocol.getTaskNo() > 0
- && !Cools.isEmpty(stationProtocol.getBarcode());
+ return canRequestStoreIn(context.getStationProtocol());
}
@Override
@@ -158,6 +168,9 @@
) {
StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.ENABLE_IN.id), stationId, entity.getBarcodeStation().getStationId(), 0);
stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "gsl-process", "enable-in");
+ if (entity.getBarcodeStation() != null && entity.getBarcodeStation().getStationId() != null) {
+ Utils.precomputeInTaskEnableRow(entity.getBarcodeStation().getStationId());
+ }
redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 15);
News.info("{}绔欑偣鍚姩鍏ュ簱鎴愬姛锛屾暟鎹寘:{}", stationId, JSON.toJSONString(command));
}
@@ -169,21 +182,46 @@
submitProcessTask(STATION_TASK_LANE, taskName, minIntervalMs, task);
}
- private void submitGenerateStoreTasks() {
+ private void generateStoreWrkFile() {
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;
+ }
+
List<StationObjModel> barcodeStations = getBarcodeStations(basDevp);
for (StationObjModel stationObjModel : barcodeStations) {
Integer stationId = stationObjModel == null ? null : stationObjModel.getStationId();
if (stationId == null) {
continue;
}
+ if (!stationMap.containsKey(stationId)) {
+ continue;
+ }
+ if (!canRequestStoreIn(stationMap.get(stationId))) {
+ continue;
+ }
submitGenerateStoreTask(stationId, DISPATCH_INTERVAL_MS,
() -> storeInTaskGenerationService.generate(this, basDevp, stationObjModel));
}
}
}
+ private boolean canRequestStoreIn(StationProtocol stationProtocol) {
+ return stationProtocol != null
+ && stationProtocol.isAutoing()
+ && stationProtocol.isLoading()
+ && stationProtocol.isInEnable()
+ && stationProtocol.getTaskNo() > 0
+ && !Cools.isEmpty(stationProtocol.getBarcode());
+ }
+
private void submitGenerateStoreTask(Integer stationId, long minIntervalMs, Runnable task) {
submitProcessTask(GENERATE_STORE_TASK_LANE_PREFIX + stationId, "generateStoreWrkFile", minIntervalMs, task);
}
--
Gitblit v1.9.1