From 88892fc38d50297c5ac5edf3fed629236bb9fd9d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 31 三月 2026 23:22:31 +0800
Subject: [PATCH] #入库同步串行请求
---
src/main/java/com/zy/core/plugin/GslProcess.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index eb4391e..88b9b2f 100644
--- a/src/main/java/com/zy/core/plugin/GslProcess.java
+++ b/src/main/java/com/zy/core/plugin/GslProcess.java
@@ -38,6 +38,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_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;
@@ -63,8 +64,8 @@
public void run() {
//妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
checkInStationHasTask();
- //璇锋眰鐢熸垚鍏ュ簱浠诲姟
- generateStoreWrkFile();
+ //鎸夌珯鐐规媶鍒嗙敓鎴愬叆搴撲换鍔★紝閬垮厤鍗曚釜绔欑偣闃诲鏁磋疆鎵弿
+ submitGenerateStoreTasks();
//鍫嗗灈鏈轰笌杈撻�佺珯鐐归兘鎸夊崟涓换鍔℃彁浜ゅ埌鍚勮嚜涓茶閫氶亾锛岄�愪釜鎵ц
submitCrnTask("crnIoExecute", DISPATCH_INTERVAL_MS, crnOperateUtils::crnIoExecute);
@@ -75,14 +76,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
@@ -176,6 +169,25 @@
submitProcessTask(STATION_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) {
submitProcessTask(CRN_TASK_LANE, taskName, minIntervalMs, task);
}
--
Gitblit v1.9.1