From 92a36252bf8e4e484cf17abf6d12b4e86497f6e9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 10 十二月 2025 09:22:22 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 80 +++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 42 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 d6f17b9..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,9 +6,6 @@
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.constant.StaGroupConstant;
import com.zy.acs.manager.core.service.MainLockWrapService;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.core.service.TrafficService;
@@ -57,42 +54,37 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
-
// @Scheduled(fixedRate = 500) // 鍥哄畾棰戠巼鎵ц锛屼笉鍚屾
@Scheduled(fixedDelay = 1000) // 鍥哄畾棰戠巼鎵ц锛屽悓姝�
// @Scheduled(cron = "0/1 * * * * ? ")
private void execute() {
if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
-
- this.autoRun(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
- this.autoRun(LocGroupConstant.LEFT_LOC_ROW_LIST, StaGroupConstant.LEFT_STA_ROW_LIST, AgvGroupConstant.SECOND_AGV_GROUP);
- this.autoRun(LocGroupConstant.MIDDLE_LOC_ROW_LIST, StaGroupConstant.MIDDLE_STA_ROW_LIST, AgvGroupConstant.THIRD_AGV_GROUP);
- this.autoRun(LocGroupConstant.RIGHT_LOC_ROW_LIST, StaGroupConstant.RIGHT_STA_ROW_LIST, AgvGroupConstant.FOURTH_AGV_GROUP);
- this.autoRun(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST, StaGroupConstant.FAR_RIGHT_STA_ROW_LIST, AgvGroupConstant.FIFTH_AGV_GROUP);
+ this.autoRun();
}
- private void autoRun(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList) {
- int availableAgvCount = this.getAvailableAgvCount(agvGroupList);
+ private void autoRun() {
+ int availableAgvCount = this.getAvailableAgvCount();
if (0 == availableAgvCount) { return; }
- // 鍏ュ簱
- this.runStaToLoc(locGroupList, staGroupList, agvGroupList);
+// List<String> staPreNos = getStaPrefixes(staGroupList);
+ List<String> staPreNos = new ArrayList<>();
+ String memo = "DEMO_STA_" + String.join("-", staPreNos);
+ // 鍏ュ簱
+ this.runStaToLoc(memo);
// 鍑哄簱
- this.runLocToSta(locGroupList, staGroupList, agvGroupList);
+ this.runLocToSta(memo);
// 绉诲簱
- this.runLocToLoc(locGroupList, agvGroupList);
-
+ this.runLocToLoc(memo);
}
// 鍏ュ簱
- private void runStaToLoc(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList) {
- Integer startRow = Collections.min(locGroupList);
- Integer endRow = Collections.max(locGroupList);
-
- List<String> staPreNos = getStaPrefixes(staGroupList);
- String memo = "DEMO_STA_" + String.join("-", staPreNos);
+ 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) {
@@ -103,7 +95,8 @@
LambdaQueryWrapper<Sta> stockWrapper = new LambdaQueryWrapper<Sta>()
.eq(Sta::getStaSts, StaStsType.STOCK.val())
.eq(Sta::getStatus, StatusType.ENABLE.val)
- .in(Sta::getStaNo, staGroupList);
+// .in(Sta::getStaNo, staGroupList)
+ ;
List<Sta> stockList = staService.list(stockWrapper);
if (Cools.isEmpty(stockList)) { return; }
Collections.shuffle(stockList);
@@ -135,12 +128,11 @@
}
// 鍑哄簱
- private void runLocToSta(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList) {
- Integer startRow = Collections.min(locGroupList);
- Integer endRow = Collections.max(locGroupList);
-
- List<String> staPreNos = getStaPrefixes(staGroupList);
- String memo = "DEMO_STA_" + String.join("-", staPreNos);
+ 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) {
@@ -152,7 +144,8 @@
LambdaQueryWrapper<Sta> idleWrapper = new LambdaQueryWrapper<Sta>()
.eq(Sta::getStaSts, StaStsType.IDLE.val())
.eq(Sta::getStatus, StatusType.ENABLE.val)
- .in(Sta::getStaNo, staGroupList);
+// .in(Sta::getStaNo, staGroupList)
+ ;
List<Sta> idleList = staService.list(idleWrapper);
if (Cools.isEmpty(idleList)) {
return;
@@ -188,18 +181,21 @@
}
// 绉诲簱
- private void runLocToLoc(List<Integer> locGroupList, List<String> agvGroupList) {
- Integer startRow = Collections.min(locGroupList);
- Integer endRow = Collections.max(locGroupList);
+ 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_" + startRow + "-" + endRow;
+ String memo = "DEMO_LOC";
- int availableAgvCount = this.getAvailableAgvCount(agvGroupList);
+ 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;
}
@@ -257,16 +253,16 @@
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