From c7a5f2ff3baf459d7c6b9dfbbd50c11bad58751f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 19 十二月 2025 08:37:16 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 188 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 150 insertions(+), 38 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 f1a45ae..0076b5f 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
@@ -6,13 +6,12 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.domain.TaskDto;
-import com.zy.acs.manager.core.service.MainLockWrapService;
-import com.zy.acs.manager.core.service.MainService;
-import com.zy.acs.manager.core.service.TrafficService;
+import com.zy.acs.manager.core.service.*;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
+import com.zy.acs.manager.manager.service.impl.CodeServiceImpl;
import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,8 +52,14 @@
private AgvModelService agvModelService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private AgvAreaDispatcher agvAreaDispatcher;
+ @Autowired
+ private AreaGovernService areaGovernService;
+ @Autowired
+ private CodeServiceImpl codeService;
-// @Scheduled(fixedRate = 500) // 鍥哄畾棰戠巼鎵ц锛屼笉鍚屾
+ // @Scheduled(fixedRate = 500) // 鍥哄畾棰戠巼鎵ц锛屼笉鍚屾
@Scheduled(fixedDelay = 1000) // 鍥哄畾棰戠巼鎵ц锛屽悓姝�
// @Scheduled(cron = "0/1 * * * * ? ")
private void execute() {
@@ -71,9 +76,9 @@
String memo = "DEMO_STA_" + String.join("-", staPreNos);
// 鍏ュ簱
- this.runStaToLoc(memo);
+ this.runStaToLoc0(memo);
// 鍑哄簱
- this.runLocToSta(memo);
+ this.runLocToSta0(memo);
// 绉诲簱
this.runLocToLoc(memo);
@@ -91,7 +96,7 @@
return;
}
- // STOCK
+ // STOCK STA
LambdaQueryWrapper<Sta> stockWrapper = new LambdaQueryWrapper<Sta>()
.eq(Sta::getStaSts, StaStsType.STOCK.val())
.eq(Sta::getStatus, StatusType.ENABLE.val)
@@ -123,6 +128,65 @@
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));
+ 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(agvModel.getBackpack(), stockList.size()) ; i++) {
+ Sta stockSta = stockList.get(i);
+ String staCode = stockSta.getCode$();
+
+ Loc idleLoc = null;
+
+ // 鎵�鍦ㄥ尯鍩熺殑鏉＄爜锛屽鏋滄病鏈塧rea缁戝畾锛屽氨鍏ㄥ湴鍥�
+ List<String> codeList = areaGovernService.queryCodesByOneCode(staCode);
+ if (Cools.isEmpty(codeList)) {
+ idleLoc = locService.selectRandOneByLocSts(LocStsType.IDLE.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.IDLE.val()));
+ if (Cools.isEmpty(locList)) {
+ break;
+ } else if (locList.size() == 1) {
+ idleLoc = locList.get(0);
+ } else {
+ Collections.shuffle(locList);
+ idleLoc = locList.get(0);
+ }
+ if (null != idleLoc) {
+ break;
+ }
+ }
+ }
+
+ if (null == idleLoc) { break; }
+
+ 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);
+ }
+ if (Cools.isEmpty(param.getTaskList())) { return; }
mainService.generateBusAndTask(param, memo);
}
@@ -180,14 +244,67 @@
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));
+ 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(), idleList.size()) ; i++) {
+ Sta idleSta = idleList.get(i);
+ String staCode = idleSta.getCode$();
+
+ 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());
+ taskDto.setDestSta(idleSta.getStaNo());
+ taskDto.setPriority(100);
+ taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
+
+ 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;
String memo = "DEMO_LOC";
int availableAgvCount = this.getAvailableAgvCount();
@@ -196,41 +313,36 @@
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()) {
- return;
- }
- Collections.shuffle(stockList);
+ List<Loc> stockLocList = locService.selectRandByLocSts(LocStsType.STOCK.val(), maxCapacity);
+// LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val());
+// List<Loc> stockList = locService.list(stockWrapper);
+// if (Cools.isEmpty(stockList) || stockList.size() < agvModel.getBackpack()) {
+// 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);
+ List<Loc> idleLocList = locService.selectRandByLocSts(LocStsType.IDLE.val(), maxCapacity);
+// LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val());
+// 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(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());
--
Gitblit v1.9.1