From 7b4ef38e8e644cfd06f4a264333c791af1cdff5f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 18 十一月 2025 17:27:56 +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 41c4ed8..f1a45ae 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,19 +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.constant.AgvGroupConstant;
-import com.zy.acs.manager.core.constant.LocGroupConstant;
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.manager.controller.param.OpenBusSubmitParam;
-import com.zy.acs.manager.manager.entity.Agv;
-import com.zy.acs.manager.manager.entity.AgvModel;
-import com.zy.acs.manager.manager.entity.Bus;
-import com.zy.acs.manager.manager.entity.Loc;
-import com.zy.acs.manager.manager.enums.AgvModelType;
-import com.zy.acs.manager.manager.enums.BusStsType;
-import com.zy.acs.manager.manager.enums.LocStsType;
+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.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
@@ -26,8 +19,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
@Slf4j
@Component
@@ -56,36 +48,154 @@
@Autowired
private LocService locService;
@Autowired
+ private StaService staService;
+ @Autowired
private AgvModelService agvModelService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
-
// @Scheduled(fixedRate = 500) // 鍥哄畾棰戠巼鎵ц锛屼笉鍚屾
@Scheduled(fixedDelay = 1000) // 鍥哄畾棰戠巼鎵ц锛屽悓姝�
// @Scheduled(cron = "0/1 * * * * ? ")
- private void autoLocToLoc() {
+ private void execute() {
if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
-
- this.runLocToLoc(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
- this.runLocToLoc(LocGroupConstant.LEFT_LOC_ROW_LIST, AgvGroupConstant.SECOND_AGV_GROUP);
- this.runLocToLoc(LocGroupConstant.MIDDLE_LOC_ROW_LIST, AgvGroupConstant.THIRD_AGV_GROUP);
- this.runLocToLoc(LocGroupConstant.RIGHT_LOC_ROW_LIST, AgvGroupConstant.FOURTH_AGV_GROUP);
- this.runLocToLoc(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST, AgvGroupConstant.FIFTH_AGV_GROUP);
+ this.autoRun();
}
- private void runLocToLoc(List<Integer> locGroupList, List<String> agvGroupList) {
- Integer startRow = Collections.min(locGroupList);
- Integer endRow = Collections.max(locGroupList);
+ private void autoRun() {
+ int availableAgvCount = this.getAvailableAgvCount();
+ if (0 == availableAgvCount) { return; }
- String memo = "DEMO_" + startRow + "-" + endRow;
+// List<String> staPreNos = getStaPrefixes(staGroupList);
+ List<String> staPreNos = new ArrayList<>();
+ String memo = "DEMO_STA_" + String.join("-", staPreNos);
- int availableAgvCount = this.getAvailableAgvCount(agvGroupList);
+ // 鍏ュ簱
+ this.runStaToLoc(memo);
+ // 鍑哄簱
+ this.runLocToSta(memo);
+
+ // 绉诲簱
+ this.runLocToLoc(memo);
+ }
+
+ // 鍏ュ簱
+ 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
+ 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 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 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();
// 鏈�澶� ? 缁刡us杩愯
if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>()
.in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val())
- .eq(Bus::getMemo, memo)
+ .in(Bus::getMemo, memo, staTaskMemo)
)) {
return;
}
@@ -105,10 +215,6 @@
return;
}
Collections.shuffle(stockList);
- if (stockList.size() > maxCapacity) {
- stockList = stockList.subList(0, maxCapacity);
- }
- int numOfStockLocList = stockList.size();
// IDLE
LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val());
@@ -119,13 +225,10 @@
return;
}
Collections.shuffle(idleList);
- if (idleList.size() > numOfStockLocList) {
- idleList = idleList.subList(0, numOfStockLocList);
- }
OpenBusSubmitParam param = new OpenBusSubmitParam();
param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
- for (int i = 0; i < numOfStockLocList; i++) {
+ 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);
@@ -140,17 +243,26 @@
mainService.generateBusAndTask(param, memo);
}
+ public static List<String> getStaPrefixes(List<String> staGroupList) {
+ Set<String> rowSet = new HashSet<>();
+ for (String s : staGroupList) {
+ rowSet.add(s.split("-")[0]);
+ }
+ List<String> result = new ArrayList<>(rowSet);
+ result.sort(Comparator.comparingInt(Integer::parseInt));
+ return result;
+ }
- private int getAvailableAgvCount(List<String> agvNos) {
+ private int getAvailableAgvCount() {
int res = 0;
- if (Cools.isEmpty(agvNos)) {
+ List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+ if (Cools.isEmpty(agvList)) {
return res;
}
- for (String agvNo : agvNos) {
- if (null == redis.getObject(RedisConstant.AGV_ONLINE_FLAG, agvNo)) {
+ for (Agv agv : agvList) {
+ if (null == redis.getObject(RedisConstant.AGV_ONLINE_FLAG, agv.getUuid())) {
continue;
}
- Agv agv = agvService.selectByUuid(agvNo);
if (!agv.getStatusBool()) {
continue;
}
--
Gitblit v1.9.1