From d3d3857cda8b4307d8f03bf15ec9fb2c98c34b64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十二月 2024 09:58:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 96 insertions(+), 12 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
index a2cf33c..9fde6cc 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -1,25 +1,25 @@
package com.zy.acs.manager.core.scheduler;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.domain.AgvTaskDto;
+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.entity.Bus;
-import com.zy.acs.manager.manager.entity.Segment;
-import com.zy.acs.manager.manager.entity.Task;
-import com.zy.acs.manager.manager.enums.BusStsType;
-import com.zy.acs.manager.manager.enums.SegmentStateType;
-import com.zy.acs.manager.manager.enums.TaskStsType;
-import com.zy.acs.manager.manager.service.ActionService;
-import com.zy.acs.manager.manager.service.BusService;
-import com.zy.acs.manager.manager.service.SegmentService;
-import com.zy.acs.manager.manager.service.TaskService;
+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.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.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -37,24 +37,37 @@
private final ReentrantLock lock = new ReentrantLock(Boolean.TRUE);
@Autowired
+ private AgvService agvService;
+ @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
+ private LocService locService;
+ @Autowired
+ private AgvModelService agvModelService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@Scheduled(cron = "0/3 * * * * ? ")
private void startupBus() throws InterruptedException {
+ if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
if (!this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS)) { return; }
List<Bus> busList = busService.selectBySts(BusStsType.RECEIVE);
for (Bus bus : busList) {
- mainService.infuseAgvForTask(bus);
+ mainService.allocateTask(bus);
}
this.lock.unlock();
}
@@ -77,7 +90,7 @@
}
for (AgvTaskDto dto : taskDtoList) {
- mainService.mergeMajorTask(dto.getAgvId(), dto.getTaskList());
+ mainLockWrapService.buildMajorTask(dto.getAgvId(), dto.getTaskList());
}
this.lock.unlock();
}
@@ -122,7 +135,78 @@
log.error("Bus [{}] 鏇存柊澶辫触 锛侊紒锛�", bus.getUuid());
}
}
+ long cancelNum = taskList.stream().filter(task -> TaskStsType.CANCEL.val() == task.getTaskSts()).count();
+ if (cancelNum == taskList.size()) {
+ bus.setBusSts(BusStsType.CANCEL.val());
+ bus.setUpdateTime(new Date());
+ if (!busService.updateById(bus)) {
+ log.error("Bus [{}] 鏇存柊澶辫触 锛侊紒锛�", bus.getUuid());
+ }
+ }
}
}
+
+
+
+
+
+ // auto loc to loc ----------------------------------------------------------------------------------------------
+
+ @Scheduled(cron = "0/1 * * * * ? ")
+ private void autoLocToLoc() {
+ if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
+
+ // 鏈�澶氫袱缁刡us杩愯
+// if (1 < busService.count(new LambdaQueryWrapper<Bus>().in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val()))) {
+// return;
+// }
+
+ int agvCount = agvService.count(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+ AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
+ if (null == agvModel || 0 == agvCount) {
+ return;
+ }
+// int maxCapacity = agvModel.getBackpack() * agvCount;
+ int maxCapacity = agvModel.getBackpack();
+
+ // STOCK
+ List<Loc> stockList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val()));
+ if (Cools.isEmpty(stockList) || stockList.size() < agvModel.getBackpack()) {
+ return;
+ }
+ Collections.shuffle(stockList);
+ if (stockList.size() > maxCapacity) {
+ stockList = stockList.subList(0, maxCapacity);
+ }
+ int numOfStockLocList = stockList.size();
+
+ // IDLE
+ List<Loc> idleList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val()));
+ if (Cools.isEmpty(idleList)) {
+ 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++) {
+ Loc stockLoc = stockList.get(i);
+ Loc idleLoc = idleList.get(i);
+
+ TaskDto taskDto = new TaskDto();
+ taskDto.setOriLoc(stockLoc.getLocNo());
+ taskDto.setDestLoc(idleLoc.getLocNo());
+ taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
+
+ param.getTaskList().add(taskDto);
+
+ }
+
+ mainService.generateBusAndTask(param, "autoLocToLoc");
+ }
+
}
--
Gitblit v1.9.1