From b1dd4c6e284244bd7224e2c050a9670fbd9a38ea Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 19 一月 2026 16:21:49 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 196 +++++++++++++++---------------------------------
1 files changed, 62 insertions(+), 134 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 0ab5997..cbd0707 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
@@ -24,6 +24,8 @@
@Component
public class AutoRunScheduler {
+ private static final AgvModelType DEFAULT_AGV_MODEL = AgvModelType.CTU_BOX_TRANSPORT_AGV;
+
private final RedisSupport redis = RedisSupport.defaultRedisSupport;
@Autowired
@@ -31,17 +33,7 @@
@Autowired
private BusService busService;
@Autowired
- private TaskService taskService;
- @Autowired
private MainService mainService;
- @Autowired
- private MainLockWrapService mainLockWrapService;
- @Autowired
- private ActionService actionService;
- @Autowired
- private SegmentService segmentService;
- @Autowired
- private TrafficService trafficService;
@Autowired
private ConfigService configService;
@Autowired
@@ -53,8 +45,6 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private AgvAreaDispatcher agvAreaDispatcher;
- @Autowired
private AreaGovernService areaGovernService;
@Autowired
private CodeServiceImpl codeService;
@@ -64,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; }
@@ -76,70 +69,19 @@
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) {
-// Integer startRow = Collections.min(locGroupList);
-// Integer endRow = Collections.max(locGroupList);
- Integer startRow = null;
- Integer endRow = null;
+ private void runStaToLoc(AgvModel agvModel, String memo) {
- AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) {
- return;
- }
// STOCK STA
- LambdaQueryWrapper<Sta> stockWrapper = new LambdaQueryWrapper<Sta>()
- .eq(Sta::getStaSts, StaStsType.STOCK.val())
- .eq(Sta::getStatus, StatusType.ENABLE.val)
-// .in(Sta::getStaNo, staGroupList)
- ;
- List<Sta> stockList = staService.list(stockWrapper);
- if (Cools.isEmpty(stockList)) { return; }
- Collections.shuffle(stockList);
-
- // IDLE
- LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val());
- if (null != startRow) { idleWrapper.ge(Loc::getRow, startRow); }
- if (null != endRow) { idleWrapper.le(Loc::getRow, endRow); }
- List<Loc> idleList = locService.list(idleWrapper);
- if (Cools.isEmpty(idleList)) { return; }
- Collections.shuffle(idleList);
-
- OpenBusSubmitParam param = new OpenBusSubmitParam();
- param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
- for (int i = 0; i < Math.min(agvModel.getBackpack(), Math.min(stockList.size(), idleList.size())) ; i++) {
- Sta stockSta = stockList.get(i);
- Loc idleLoc = idleList.get(i);
-
- TaskDto taskDto = new TaskDto();
- taskDto.setOriSta(stockSta.getStaNo());
- taskDto.setDestLoc(idleLoc.getLocNo());
- taskDto.setPriority(100);
- taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
-
- param.getTaskList().add(taskDto);
- }
-
- mainService.generateBusAndTask(param, memo);
- }
-
- private void runStaToLoc0(String memo) {
- AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) { return; }
-
- // 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);
@@ -147,14 +89,14 @@
param.setBatch(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;
// 鎵�鍦ㄥ尯鍩熺殑鏉＄爜锛屽鏋滄病鏈塧rea缁戝畾锛屽氨鍏ㄥ湴鍥�
List<String> codeList = areaGovernService.queryCodesByOneCode(staCode);
if (Cools.isEmpty(codeList)) {
- idleLoc = locService.selectRandOneByLocSts(LocStsType.IDLE.val());
+ idleLoc = locService.selectRandOneByLocSts(LocStsType.IDLE.val(), 1);
} else {
Collections.shuffle(codeList);
for (String codeData : codeList) {
@@ -192,45 +134,47 @@
}
// 鍑哄簱
- private void runLocToSta(String memo) {
-// Integer startRow = Collections.min(locGroupList);
-// Integer endRow = Collections.max(locGroupList);
- Integer startRow = null;
- Integer endRow = null;
+ private void runLocToSta(AgvModel agvModel, String memo) {
- AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) {
- return;
- }
- int maxCapacity = agvModel.getBackpack();
-
- // STA IDLE
- LambdaQueryWrapper<Sta> idleWrapper = new LambdaQueryWrapper<Sta>()
- .eq(Sta::getStaSts, StaStsType.IDLE.val())
- .eq(Sta::getStatus, StatusType.ENABLE.val)
-// .in(Sta::getStaNo, staGroupList)
- ;
- List<Sta> idleList = staService.list(idleWrapper);
- if (Cools.isEmpty(idleList)) {
- return;
- }
+ // IDLE STA
+ List<Sta> idleList = staService.queryAvailableInSta(1);
+ if (Cools.isEmpty(idleList)) { return; }
Collections.shuffle(idleList);
-
- // LOC STOCK
- LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val());
- if (null != startRow) { stockWrapper.ge(Loc::getRow, startRow); }
- if (null != endRow) { stockWrapper.le(Loc::getRow, endRow); }
- List<Loc> stockList = locService.list(stockWrapper);
- if (Cools.isEmpty(stockList)) {
- return;
- }
- Collections.shuffle(stockList);
OpenBusSubmitParam param = new OpenBusSubmitParam();
param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
- for (int i = 0; i < Math.min(maxCapacity, Math.min(idleList.size(), stockList.size())); i++) {
- Loc stockLoc = stockList.get(i);
+ for (int i = 0; i < Math.min(agvModel.getBackpack(), idleList.size()) ; i++) {
Sta idleSta = idleList.get(i);
+ String staCode = codeService.getCacheById(idleSta.getCode()).getData();
+
+ Loc stockLoc = null;
+
+ // 鎵�鍦ㄥ尯鍩熺殑鏉＄爜锛屽鏋滄病鏈塧rea缁戝畾锛屽氨鍏ㄥ湴鍥�
+ List<String> codeList = areaGovernService.queryCodesByOneCode(staCode);
+ if (Cools.isEmpty(codeList)) {
+ stockLoc = locService.selectRandOneByLocSts(LocStsType.STOCK.val(), 1);
+ } else {
+ Collections.shuffle(codeList);
+ for (String codeData : codeList) {
+ Code code = codeService.getCacheByData(codeData);
+ if (null == code) { break; }
+ List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getCode, code.getId()).eq(Loc::getLocSts, LocStsType.STOCK.val()));
+ if (Cools.isEmpty(locList)) {
+ break;
+ } else if (locList.size() == 1) {
+ stockLoc = locList.get(0);
+ } else {
+ Collections.shuffle(locList);
+ stockLoc = locList.get(0);
+ }
+ if (null != stockLoc) {
+ break;
+ }
+ }
+ }
+
+ if (null == stockLoc) { break; }
TaskDto taskDto = new TaskDto();
taskDto.setOriLoc(stockLoc.getLocNo());
@@ -240,18 +184,13 @@
param.getTaskList().add(taskDto);
}
+ if (Cools.isEmpty(param.getTaskList())) { return; }
mainService.generateBusAndTask(param, memo);
}
// 绉诲簱
- private void runLocToLoc(String staTaskMemo) {
-// Integer startRow = Collections.min(locGroupList);
-// Integer endRow = Collections.max(locGroupList);
- Integer startRow = null;
- Integer endRow = null;
-
-// String memo = "DEMO_LOC_" + startRow + "-" + endRow;
+ private void runLocToLoc(AgvModel agvModel, String staTaskMemo) {
String memo = "DEMO_LOC";
int availableAgvCount = this.getAvailableAgvCount();
@@ -260,41 +199,29 @@
if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>()
.in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val())
.in(Bus::getMemo, memo, staTaskMemo)
- )) {
- return;
- }
+ )) { 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();
// STOCK
- LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val());
- if (null != startRow) { stockWrapper.ge(Loc::getRow, startRow); }
- if (null != endRow) { stockWrapper.le(Loc::getRow, endRow); }
- List<Loc> stockList = locService.list(stockWrapper);
- if (Cools.isEmpty(stockList) || stockList.size() < agvModel.getBackpack()) {
+ List<Loc> stockLocList = locService.selectRandByLocSts(LocStsType.STOCK.val(), maxCapacity);
+ if (Cools.isEmpty(stockLocList)) {
return;
}
- Collections.shuffle(stockList);
+ Collections.shuffle(stockLocList);
// IDLE
- LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val());
- if (null != startRow) { idleWrapper.ge(Loc::getRow, startRow); }
- if (null != endRow) { idleWrapper.le(Loc::getRow, endRow); }
- List<Loc> idleList = locService.list(idleWrapper);
- if (Cools.isEmpty(idleList)) {
+ List<Loc> idleLocList = locService.selectRandByLocSts(LocStsType.IDLE.val(), maxCapacity);
+ if (Cools.isEmpty(idleLocList)) {
return;
}
- Collections.shuffle(idleList);
+ Collections.shuffle(idleLocList);
OpenBusSubmitParam param = new OpenBusSubmitParam();
param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
- for (int i = 0; i < Math.min(maxCapacity, Math.min(stockList.size(), idleList.size())); i++) {
- Loc stockLoc = stockList.get(i);
- Loc idleLoc = idleList.get(i);
+ 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);
TaskDto taskDto = new TaskDto();
taskDto.setOriLoc(stockLoc.getLocNo());
@@ -303,6 +230,7 @@
param.getTaskList().add(taskDto);
}
+ if (Cools.isEmpty(param.getTaskList())) { return; }
mainService.generateBusAndTask(param, memo);
}
--
Gitblit v1.9.1