From 3e28500e76ffd71b7da90f40d1f3126c00a0e5f0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 13 四月 2026 14:49:41 +0800
Subject: [PATCH] #站点运行优化
---
src/main/java/com/zy/core/plugin/GslProcess.java | 152 +++++++++++++++++++++++++++-----------------------
1 files changed, 83 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index 51553df..dfd2d5f 100644
--- a/src/main/java/com/zy/core/plugin/GslProcess.java
+++ b/src/main/java/com/zy/core/plugin/GslProcess.java
@@ -3,9 +3,10 @@
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.WrkLastno;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.WrkLastnoService;
import com.zy.common.service.CommonService;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
@@ -50,14 +51,16 @@
@Autowired
private RedisUtil redisUtil;
@Autowired
+ private WrkLastnoService wrkLastnoService;
+ @Autowired
private StoreInTaskGenerationService storeInTaskGenerationService;
@Autowired
private StationCommandDispatcher stationCommandDispatcher;
@Override
public void run() {
- //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
- checkInStationHasTask();
+ //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞舵寜绔欑偣 lane 寮傛鍚姩鍏ュ簱
+ stationOperateProcessUtils.submitStationEnableInTasks(DISPATCH_INTERVAL_MS);
//璇锋眰鐢熸垚鍏ュ簱浠诲姟锛屼繚鐣欐寜绔欑偣 lane 涓茶鎻愪氦
generateStoreWrkFile();
@@ -77,12 +80,8 @@
stationOperateProcessUtils.submitCheckTaskToCompleteTasks(DISPATCH_INTERVAL_MS);
// 妫�娴嬪苟澶勭悊鍑哄簱鎺掑簭
stationOperateProcessUtils.submitCheckStationOutOrderTasks(MAINTENANCE_INTERVAL_MS);
-// // 鐩戞帶杈撻�佺嚎缁曞湀绔欑偣
-// stationOperateProcessUtils.submitWatchCircleStationTasks(MAINTENANCE_INTERVAL_MS);
// 妫�娴嬭緭閫佺嚎杩愯鍫靛
stationOperateProcessUtils.submitCheckStationRunBlockTasks(MAINTENANCE_INTERVAL_MS);
-// // 妫�娴嬬珯鍙扮┖闂茶秴鏃跺悗鐨勬仮澶嶅鐞�
-// stationOperateProcessUtils.submitCheckStationIdleRecoverTasks(MAINTENANCE_INTERVAL_MS);
}
@Override
@@ -90,52 +89,6 @@
InTaskApplyRequest request = StoreInTaskPolicy.super.buildApplyRequest(context);
request.getExtraParams().put("weight", context.getStationProtocol().getWeight());
return request;
- }
-
- //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
- private synchronized void checkInStationHasTask() {
- 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();
-
- List<StationObjModel> list = basDevp.getInStationList$();
- for (StationObjModel entity : list) {
- Integer stationId = entity.getStationId();
- if(!stationMap.containsKey(stationId)){
- continue;
- }
-
- StationProtocol stationProtocol = stationMap.get(stationId);
- if (stationProtocol == null) {
- continue;
- }
-
- Object lock = redisUtil.get(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId);
- if(lock != null){
- continue;
- }
-
- //婊¤冻鑷姩銆佹棤鐗┿�佸伐浣滃彿0锛岀敓鎴愬叆搴撴暟鎹�
- if (stationProtocol.isAutoing()
- && stationProtocol.isLoading()
- && stationProtocol.getTaskNo() == 0
- && stationProtocol.isEnableIn()
- ) {
- 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));
- }
- }
- }
}
private void generateStoreWrkFile() {
@@ -163,29 +116,54 @@
if (!handleErrorStationBack(basDevp, stationThread, stationObjModel, stationMap.get(stationId))) {
continue;
}
- if (!canRequestStoreIn(stationMap.get(stationId))) {
+
+ StationProtocol stationProtocol = stationMap.get(stationId);
+ if (stationProtocol == null) {
continue;
}
+
+ if (!stationProtocol.isAutoing()) {
+ continue;
+ }
+
+ if (!stationProtocol.isLoading()) {
+ continue;
+ }
+
+ if (!stationProtocol.isInEnable()) {
+ continue;
+ }
+
+ if (stationProtocol.getTaskNo() == 0) {
+ continue;
+ }
+
+ if (Cools.isEmpty(stationProtocol.getBarcode())) {
+ continue;
+ }
+
+ if (stationProtocol.getError() > 0) {
+ continue;
+ }
+
+ if (stationProtocol.isInBarcodeError()) {
+ continue;
+ }
+
storeInTaskGenerationService.submitGenerateStoreTask(this, basDevp, stationObjModel, DISPATCH_INTERVAL_MS,
() -> storeInTaskGenerationService.generate(this, basDevp, stationObjModel));
}
}
}
- private boolean canRequestStoreIn(StationProtocol stationProtocol) {
- return stationProtocol != null
- && stationProtocol.getError() <= 0
- && stationProtocol.isAutoing()
- && stationProtocol.isLoading()
- && stationProtocol.isInEnable()
- && stationProtocol.getTaskNo() > 0
- && !Cools.isEmpty(stationProtocol.getBarcode());
- }
-
private boolean handleErrorStationBack(BasDevp basDevp,
StationThread stationThread,
StationObjModel stationObjModel,
StationProtocol stationProtocol) {
+ if (stationProtocol == null) {
+ return false;
+ }
+
if (!stationProtocol.isAutoing()) {
return false;
}
@@ -195,15 +173,51 @@
}
if (stationProtocol.getError() <= 0) {
- return true;
+ return true;//绔欑偣鏃犳晠闅�
}
- Object lock = redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId());
- if (lock != null) {
+ if (!stationProtocol.isInBarcodeError()) {
+ return true;//绔欑偣鏃犲紓甯�
+ }
+
+ WrkLastno stationBackTaskRange = wrkLastnoService.getById(WrkIoType.STATION_BACK.id);
+ Integer currentTaskNo = stationProtocol.getTaskNo();
+ if (currentTaskNo != null
+ && currentTaskNo > 0
+ && stationBackTaskRange != null
+ && stationBackTaskRange.getsNo() != null
+ && stationBackTaskRange.geteNo() != null
+ && currentTaskNo >= stationBackTaskRange.getsNo()
+ && currentTaskNo <= stationBackTaskRange.geteNo()) {
+ News.info("鏉＄爜绔欏凡澶勪簬閫�鍥炲伐浣滃彿鑼冨洿锛岃烦杩囬噸澶嶇敓鎴愰��鍥炲懡浠ゃ�俿tationId={}锛宼askNo={}锛宺ange=[{}, {}]",
+ stationProtocol.getStationId(),
+ currentTaskNo,
+ stationBackTaskRange.getsNo(),
+ stationBackTaskRange.geteNo());
return false;
}
StationObjModel backStation = stationObjModel.getBackStation();
+ if (backStation == null || backStation.getStationId() == null) {
+ News.warn("鏉＄爜绔欓��鍥炲け璐ワ紝閫�鍥炵珯鏈厤缃�俤eviceNo={}锛宻tationId={}",
+ basDevp == null ? null : basDevp.getDevpNo(),
+ stationProtocol.getStationId());
+ return false;
+ }
+
+ // 褰撳墠绔欑偣宸茬粡鎸傜潃閫�鍥炵洰鏍囨椂锛屼笉鍐嶉噸澶嶇敓鎴愭柊鐨勯��鍥炲伐浣滃彿銆�
+ if (stationProtocol.getTaskNo() != null
+ && stationProtocol.getTaskNo() > 0
+ && backStation.getStationId().equals(stationProtocol.getTargetStaNo())) {
+ return false;
+ }
+
+ String lockKey = RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId();
+ Object lock = redisUtil.get(lockKey);
+ if (lock != null) {
+ return false;
+ }
+
StationCommand command = stationThread.getCommand(StationCommandType.MOVE,
commonService.getWorkNo(WrkIoType.STATION_BACK.id),
stationObjModel.getStationId(),
@@ -213,8 +227,8 @@
return false;
}
stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "gsl-process", "station-back");
- News.taskInfo(stationProtocol.getTaskNo(), "{}鎵爜寮傚父锛屽凡閫�鍥炶嚦{}", backStation.getStationId());
- redisUtil.set(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId(), "lock", 10);
+ News.info("{}鎵爜绔欏紓甯革紝宸查��鍥炶嚦{},鏉＄爜绔欑姸鎬侊細{}", stationProtocol.getTaskNo(), backStation.getStationId(), JSON.toJSONString(stationProtocol));
+ redisUtil.set(lockKey, "lock", 60 * 60);
return false;
}
--
Gitblit v1.9.1