From 1817a79605b464735014a00e762e715788229a4b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 01 四月 2026 11:41:14 +0800
Subject: [PATCH] #入库获取Row优化
---
src/main/java/com/zy/core/plugin/GslProcess.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index 23ccfdd..0493c12 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;
@@ -38,7 +39,7 @@
public class GslProcess implements MainProcessPluginApi, StoreInTaskPolicy {
private static final String CRN_TASK_LANE = "crn";
private static final String STATION_TASK_LANE = "station";
- private static final String GENERATE_STORE_TASK_LANE = "generate-store";
+ private static final String GENERATE_STORE_TASK_LANE_PREFIX = "generate-store-";
private static final long DISPATCH_INTERVAL_MS = 200L;
private static final long MAINTENANCE_INTERVAL_MS = 500L;
private static final long TASK_SLOW_LOG_THRESHOLD_MS = 1000L;
@@ -64,8 +65,8 @@
public void run() {
//妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
checkInStationHasTask();
- //璇锋眰鐢熸垚鍏ュ簱浠诲姟
- submitGenerateStoreTask("generateStoreWrkFile", DISPATCH_INTERVAL_MS, this::generateStoreWrkFile);
+ //鎸夌珯鐐规媶鍒嗙敓鎴愬叆搴撲换鍔★紝閬垮厤鍗曚釜绔欑偣闃诲鏁磋疆鎵弿
+ submitGenerateStoreTasks();
//鍫嗗灈鏈轰笌杈撻�佺珯鐐归兘鎸夊崟涓换鍔℃彁浜ゅ埌鍚勮嚜涓茶閫氶亾锛岄�愪釜鎵ц
submitCrnTask("crnIoExecute", DISPATCH_INTERVAL_MS, crnOperateUtils::crnIoExecute);
@@ -76,14 +77,6 @@
submitStationTask("watchCircleStation", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::watchCircleStation);
submitStationTask("checkStationRunBlock", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationRunBlock);
submitStationTask("checkStationIdleRecover", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationIdleRecover);
- }
-
- /**
- * 璇锋眰鐢熸垚鍏ュ簱浠诲姟
- * 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗�
- */
- public synchronized void generateStoreWrkFile() {
- storeInTaskGenerationService.generate(this);
}
@Override
@@ -166,6 +159,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));
}
@@ -177,8 +173,23 @@
submitProcessTask(STATION_TASK_LANE, taskName, minIntervalMs, task);
}
- private void submitGenerateStoreTask(String taskName, long minIntervalMs, Runnable task) {
- submitProcessTask(GENERATE_STORE_TASK_LANE, taskName, minIntervalMs, task);
+ private void submitGenerateStoreTasks() {
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
+ for (BasDevp basDevp : basDevps) {
+ List<StationObjModel> barcodeStations = getBarcodeStations(basDevp);
+ for (StationObjModel stationObjModel : barcodeStations) {
+ Integer stationId = stationObjModel == null ? null : stationObjModel.getStationId();
+ if (stationId == null) {
+ continue;
+ }
+ submitGenerateStoreTask(stationId, DISPATCH_INTERVAL_MS,
+ () -> storeInTaskGenerationService.generate(this, basDevp, stationObjModel));
+ }
+ }
+ }
+
+ private void submitGenerateStoreTask(Integer stationId, long minIntervalMs, Runnable task) {
+ submitProcessTask(GENERATE_STORE_TASK_LANE_PREFIX + stationId, "generateStoreWrkFile", minIntervalMs, task);
}
private void submitCrnTask(String taskName, long minIntervalMs, Runnable task) {
--
Gitblit v1.9.1