From 1449f52d572080616a40e72ded89c5ae53a5b546 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 06 十二月 2025 08:39:56 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/EfficiencyTestV2Scheduler.java | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/EfficiencyTestScheduler.java | 18 ++--
2 files changed, 221 insertions(+), 10 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/EfficiencyTestScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/EfficiencyTestScheduler.java
index 650d158..76401e6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/EfficiencyTestScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/EfficiencyTestScheduler.java
@@ -98,19 +98,19 @@
if (mode != null && mode == 1) {
// 鍏ュ簱
- this.runStaToLoc(locGroupList, staGroupList, staTaskMemo, taskNum,"3-1");
- this.runStaToLoc(locGroupList, staGroupList, staTaskMemo, taskNum,"4-1");
+ this.runStaToLoc(locGroupList, staGroupList, staTaskMemo, taskNum);
+ this.runStaToLoc(locGroupList, staGroupList, staTaskMemo, taskNum);
} else if (mode == 2) {
// 鍑哄簱
- this.runLocToSta(locGroupList, staGroupList, staTaskMemo, taskNum,"3-1");
- this.runLocToSta(locGroupList, staGroupList, staTaskMemo, taskNum,"4-1");
+ this.runLocToSta(locGroupList, staGroupList, staTaskMemo, taskNum);
+ this.runLocToSta(locGroupList, staGroupList, staTaskMemo, taskNum);
}
}
// 鍏ュ簱
- private void runStaToLoc(List<Integer> locGroupList, List<String> staGroupList, String memo, Integer taskNum,String sta) {
+ private void runStaToLoc(List<Integer> locGroupList, List<String> staGroupList, String memo, Integer taskNum) {
Integer startRow = Collections.min(locGroupList);
Integer endRow = Collections.max(locGroupList);
@@ -126,7 +126,6 @@
if (Cools.isEmpty(stockList)) {
return;
}
- Collections.shuffle(stockList);
// IDLE
LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val());
@@ -147,7 +146,7 @@
for (int i = 0; i <taskNum; i++) {
Loc idleLoc = idleList.get(i);
TaskDto taskDto = new TaskDto();
- taskDto.setOriSta(sta);
+ taskDto.setOriSta(stockList.get(0).getStaNo());
taskDto.setDestLoc(idleLoc.getLocNo());
taskDto.setPriority(100);
taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
@@ -160,7 +159,7 @@
// 鍑哄簱
- private void runLocToSta(List<Integer> locGroupList, List<String> staGroupList, String memo, Integer taskNum,String sta) {
+ private void runLocToSta(List<Integer> locGroupList, List<String> staGroupList, String memo, Integer taskNum) {
Integer startRow = Collections.min(locGroupList);
Integer endRow = Collections.max(locGroupList);
@@ -175,7 +174,6 @@
if (Cools.isEmpty(idleList)) {
return;
}
- Collections.shuffle(idleList);
// LOC STOCK
LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val());
@@ -198,7 +196,7 @@
TaskDto taskDto = new TaskDto();
taskDto.setOriLoc(stockLoc.getLocNo());
- taskDto.setDestSta(sta);
+ taskDto.setDestSta(idleList.get(0).getStaNo());
taskDto.setPriority(100);
taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
taskDto.setMemo(memo);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/EfficiencyTestV2Scheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/EfficiencyTestV2Scheduler.java
new file mode 100644
index 0000000..8e968eb
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/EfficiencyTestV2Scheduler.java
@@ -0,0 +1,213 @@
+package com.zy.acs.manager.core.scheduler;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.acs.common.constant.RedisConstant;
+import com.zy.acs.common.utils.RedisSupport;
+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.MainService;
+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.Loc;
+import com.zy.acs.manager.manager.entity.Task;
+import com.zy.acs.manager.manager.enums.AgvModelType;
+import com.zy.acs.manager.manager.enums.LocStsType;
+import com.zy.acs.manager.manager.enums.TaskStsType;
+import com.zy.acs.manager.manager.service.*;
+import com.zy.acs.manager.system.service.ConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+@Slf4j
+@Component
+public class EfficiencyTestV2Scheduler {
+
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
+ @Autowired
+ private AgvService agvService;
+ @Autowired
+ private MainService mainService;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private StaService staService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private AgvModelService agvModelService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+
+
+ @Scheduled(fixedDelay = 1000) // 鍥哄畾棰戠巼鎵ц锛屽悓姝�
+ private void execute() {
+ String efficiency = configService.getVal("EfficiencyV2", String.class);
+ // 1/0,23,1/2,1-5,1 1,60,7-ruku
+ // 鏄惁寮�鍚�,1寮�鍚紝0鍏抽棴 鍝簺鍖猴紝1鍏ュ簱杩樻槸2鍑哄簱锛屼竴娆＄敓鎴愪换鍔℃暟閲�,鏈�澶т换鍔℃暟
+ if (!Cools.isEmpty(efficiency)) {
+ String[] split = efficiency.split(",");
+ if (split[0].equals("1")) {
+ this.autoRun(LocGroupConstant.RIGHT_LOC_ROW_LIST, StaGroupConstant.RIGHT_STA_ROW_LIST, AgvGroupConstant.FOURTH_AGV_GROUP, 5, Integer.parseInt(split[1]), split[2]);
+ }
+ }
+ }
+
+ private void autoRun(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList, Integer taskNum, Integer taskMax, String memo) {
+
+ List<String> staPreNos = getStaPrefixes(staGroupList);
+ String staTaskMemo = "DEMO_STA_" + String.join("-", staPreNos) + "_" + memo;
+
+ // 鏈�澶� ? 涓换鍔¤繍琛�
+ if (taskMax <= taskService.count(new LambdaQueryWrapper<Task>().in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()).in(Task::getMemo, staTaskMemo))) {
+ return;
+ }
+ Integer startRow = Collections.min(locGroupList);
+ Integer endRow = Collections.max(locGroupList);
+ 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() < 5) {
+ return;
+ }
+
+ // 鍏ュ簱
+ this.runStaToLoc(locGroupList, staGroupList, staTaskMemo, taskNum, "4-1");
+ // 鍑哄簱
+ this.runLocToSta(locGroupList, staGroupList, staTaskMemo, taskNum, "3-1");
+
+ }
+
+
+ // 鍏ュ簱
+ private void runStaToLoc(List<Integer> locGroupList, List<String> staGroupList, String memo, Integer taskNum, String sta) {
+ Integer startRow = Collections.min(locGroupList);
+ Integer endRow = Collections.max(locGroupList);
+
+
+ AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
+ if (null == agvModel) {
+ return;
+ }
+
+
+ // 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 < taskNum; i++) {
+ Loc idleLoc = idleList.get(i);
+ TaskDto taskDto = new TaskDto();
+ taskDto.setOriSta(sta);
+ taskDto.setDestLoc(idleLoc.getLocNo());
+ taskDto.setPriority(100);
+ taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
+ taskDto.setMemo(memo);
+ param.getTaskList().add(taskDto);
+ }
+
+ mainService.generateBusAndTask(param, memo);
+ }
+
+
+ // 鍑哄簱
+ private void runLocToSta(List<Integer> locGroupList, List<String> staGroupList, String memo, Integer taskNum, String sta) {
+ Integer startRow = Collections.min(locGroupList);
+ Integer endRow = Collections.max(locGroupList);
+
+ AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
+ if (null == agvModel) {
+ return;
+ }
+
+
+ // 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 < taskNum; i++) {
+ Loc stockLoc = stockList.get(i);
+
+ TaskDto taskDto = new TaskDto();
+ taskDto.setOriLoc(stockLoc.getLocNo());
+ taskDto.setDestSta(sta);
+ taskDto.setPriority(100);
+ taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
+ taskDto.setMemo(memo);
+ param.getTaskList().add(taskDto);
+ }
+
+ 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) {
+ int res = 0;
+ if (Cools.isEmpty(agvNos)) {
+ return res;
+ }
+ for (String agvNo : agvNos) {
+ if (null == redis.getObject(RedisConstant.AGV_ONLINE_FLAG, agvNo)) {
+ continue;
+ }
+ Agv agv = agvService.selectByUuid(agvNo);
+ if (!agv.getStatusBool()) {
+ continue;
+ }
+ res++;
+ }
+
+ return res;
+ }
+
+}
--
Gitblit v1.9.1