From 7ac5a3f2bcbb0d0e13dc87cd969c8fb1fd99b488 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期日, 04 一月 2026 10:38:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 163 +++++------------------------------------------------
1 files changed, 17 insertions(+), 146 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 d1e72a8..de2f431 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
@@ -31,17 +31,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
@@ -52,8 +42,6 @@
private AgvModelService agvModelService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private AgvAreaDispatcher agvAreaDispatcher;
@Autowired
private AreaGovernService areaGovernService;
@Autowired
@@ -86,60 +74,11 @@
// 鍏ュ簱
private void runStaToLoc(String memo) {
-// Integer startRow = Collections.min(locGroupList);
-// Integer endRow = Collections.max(locGroupList);
- Integer startRow = null;
- Integer endRow = null;
-
- 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);
@@ -154,7 +93,7 @@
// 鎵�鍦ㄥ尯鍩熺殑鏉＄爜锛屽鏋滄病鏈塧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) {
@@ -193,65 +132,11 @@
// 鍑哄簱
private void runLocToSta(String memo) {
-// Integer startRow = Collections.min(locGroupList);
-// Integer endRow = Collections.max(locGroupList);
- Integer startRow = null;
- Integer endRow = null;
-
- 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;
- }
- 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);
- Sta idleSta = idleList.get(i);
-
- TaskDto taskDto = new TaskDto();
- taskDto.setOriLoc(stockLoc.getLocNo());
- taskDto.setDestSta(idleSta.getStaNo());
- taskDto.setPriority(100);
- taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
-
- param.getTaskList().add(taskDto);
- }
-
- mainService.generateBusAndTask(param, memo);
- }
-
- private void runLocToSta0(String memo) {
AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
if (null == agvModel) { return; }
// 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);
@@ -266,7 +151,7 @@
// 鎵�鍦ㄥ尯鍩熺殑鏉＄爜锛屽鏋滄病鏈塧rea缁戝畾锛屽氨鍏ㄥ湴鍥�
List<String> codeList = areaGovernService.queryCodesByOneCode(staCode);
if (Cools.isEmpty(codeList)) {
- stockLoc = locService.selectRandOneByLocSts(LocStsType.STOCK.val());
+ stockLoc = locService.selectRandOneByLocSts(LocStsType.STOCK.val(), 1);
} else {
Collections.shuffle(codeList);
for (String codeData : codeList) {
@@ -305,12 +190,6 @@
// 绉诲簱
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;
String memo = "DEMO_LOC";
int availableAgvCount = this.getAvailableAgvCount();
@@ -319,41 +198,32 @@
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;
- }
+ 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());
@@ -362,6 +232,7 @@
param.getTaskList().add(taskDto);
}
+ if (Cools.isEmpty(param.getTaskList())) { return; }
mainService.generateBusAndTask(param, memo);
}
--
Gitblit v1.9.1