From 6ad41312c1e9168af9c59202bd8c54b457741fdb Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 02 二月 2026 14:00:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 68 +++++++++++++++------------------
1 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
index dfb2d87..df853c7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
@@ -7,7 +7,7 @@
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.domain.TaskDto;
import com.zy.acs.manager.core.service.*;
-import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
+import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
@@ -23,6 +23,8 @@
@Slf4j
@Component
public class AutoRunScheduler {
+
+ private static final AgvModelType DEFAULT_AGV_MODEL = AgvModelType.CTU_BOX_TRANSPORT_AGV;
private final RedisSupport redis = RedisSupport.defaultRedisSupport;
@@ -52,10 +54,13 @@
// @Scheduled(cron = "0/1 * * * * ? ")
private void execute() {
if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
- this.autoRun();
+ AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, DEFAULT_AGV_MODEL.toString()));
+ if (null == agvModel) { return; }
+
+ this.autoRun(agvModel);
}
- private void autoRun() {
+ private void autoRun(AgvModel agvModel) {
int availableAgvCount = this.getAvailableAgvCount();
if (0 == availableAgvCount) { return; }
@@ -64,31 +69,27 @@
String memo = "DEMO_STA_" + String.join("-", staPreNos);
// 鍏ュ簱
- this.runStaToLoc(memo);
+ this.runStaToLoc(agvModel, memo);
// 鍑哄簱
- this.runLocToSta(memo);
-
+ this.runLocToSta(agvModel, memo);
// 绉诲簱
- this.runLocToLoc(memo);
+ this.runLocToLoc(agvModel, memo);
}
// 鍏ュ簱
- private void runStaToLoc(String memo) {
- AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) { return; }
+ private void runStaToLoc(AgvModel agvModel, String memo) {
+
// STOCK STA
- List<Sta> stockList = staService.list(new LambdaQueryWrapper<Sta>()
- .eq(Sta::getStaSts, StaStsType.STOCK.val())
- .eq(Sta::getStatus, StatusType.ENABLE.val));
+ List<Sta> stockList = staService.queryAvailableOutSta(1);
if (Cools.isEmpty(stockList)) { return; }
Collections.shuffle(stockList);
OpenBusSubmitParam param = new OpenBusSubmitParam();
- param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
+ param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
for (int i = 0; i < Math.min(agvModel.getBackpack(), stockList.size()) ; i++) {
Sta stockSta = stockList.get(i);
- String staCode = stockSta.getCode$();
+ String staCode = codeService.getCacheById(stockSta.getCode()).getData();
Loc idleLoc = null;
@@ -123,32 +124,28 @@
taskDto.setOriSta(stockSta.getStaNo());
taskDto.setDestLoc(idleLoc.getLocNo());
taskDto.setPriority(100);
- taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
+ taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
- param.getTaskList().add(taskDto);
+ param.getTasks().add(taskDto);
}
- if (Cools.isEmpty(param.getTaskList())) { return; }
+ if (Cools.isEmpty(param.getTasks())) { return; }
mainService.generateBusAndTask(param, memo);
}
// 鍑哄簱
- private void runLocToSta(String memo) {
- AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) { return; }
+ private void runLocToSta(AgvModel agvModel, String memo) {
// IDLE STA
- List<Sta> idleList = staService.list(new LambdaQueryWrapper<Sta>()
- .eq(Sta::getStaSts, StaStsType.IDLE.val())
- .eq(Sta::getStatus, StatusType.ENABLE.val));
+ List<Sta> idleList = staService.queryAvailableInSta(1);
if (Cools.isEmpty(idleList)) { return; }
Collections.shuffle(idleList);
OpenBusSubmitParam param = new OpenBusSubmitParam();
- param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
+ param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
for (int i = 0; i < Math.min(agvModel.getBackpack(), idleList.size()) ; i++) {
Sta idleSta = idleList.get(i);
- String staCode = idleSta.getCode$();
+ String staCode = codeService.getCacheById(idleSta.getCode()).getData();
Loc stockLoc = null;
@@ -183,17 +180,17 @@
taskDto.setOriLoc(stockLoc.getLocNo());
taskDto.setDestSta(idleSta.getStaNo());
taskDto.setPriority(100);
- taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
+ taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
- param.getTaskList().add(taskDto);
+ param.getTasks().add(taskDto);
}
- if (Cools.isEmpty(param.getTaskList())) { return; }
+ if (Cools.isEmpty(param.getTasks())) { return; }
mainService.generateBusAndTask(param, memo);
}
// 绉诲簱
- private void runLocToLoc(String staTaskMemo) {
+ private void runLocToLoc(AgvModel agvModel, String staTaskMemo) {
String memo = "DEMO_LOC";
int availableAgvCount = this.getAvailableAgvCount();
@@ -203,9 +200,6 @@
.in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val())
.in(Bus::getMemo, memo, staTaskMemo)
)) { return; }
-
- AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) { return; }
int maxCapacity = agvModel.getBackpack();
@@ -224,7 +218,7 @@
Collections.shuffle(idleLocList);
OpenBusSubmitParam param = new OpenBusSubmitParam();
- param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
+ param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
for (int i = 0; i < Math.min(maxCapacity, Math.min(stockLocList.size(), idleLocList.size())); i++) {
Loc stockLoc = stockLocList.get(i);
Loc idleLoc = idleLocList.get(i);
@@ -232,11 +226,11 @@
TaskDto taskDto = new TaskDto();
taskDto.setOriLoc(stockLoc.getLocNo());
taskDto.setDestLoc(idleLoc.getLocNo());
- taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
+ taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
- param.getTaskList().add(taskDto);
+ param.getTasks().add(taskDto);
}
- if (Cools.isEmpty(param.getTaskList())) { return; }
+ if (Cools.isEmpty(param.getTasks())) { return; }
mainService.generateBusAndTask(param, memo);
}
--
Gitblit v1.9.1