From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 五月 2025 08:48:15 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 112 +++++++-------------------------------------------------
1 files changed, 14 insertions(+), 98 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 79e4062..43d4ac0 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,27 +1,28 @@
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.controller.param.OpenBusSubmitParam;
-import com.zy.acs.manager.manager.entity.*;
-import com.zy.acs.manager.manager.enums.*;
+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.ActionStsType;
+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.*;
import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -35,7 +36,7 @@
@Component
public class KernelScheduler {
- public static int CORE_SCAN_FREQUENCY_MILLISECOND = 30;
+ public static int CORE_SCAN_FREQUENCY_MILLISECOND = 15;
private static final int LOCK_TIMEOUT = 5;
@@ -67,12 +68,10 @@
private LocService locService;
@Autowired
private AgvModelService agvModelService;
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
@Scheduled(cron = "0/1 * * * * ? ")
private void startupBus() throws InterruptedException {
- if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
+// 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) {
@@ -104,7 +103,7 @@
this.lock.unlock();
}
- @PostConstruct
+ @EventListener(ApplicationReadyEvent.class)
public void init() {
try { Thread.sleep(1200); } catch (InterruptedException ignore) {}
// traffic calculate
@@ -119,7 +118,7 @@
for (Segment segment : segments) {
long startTime = System.currentTimeMillis();
trafficService.trigger(segment);
- log.info("traffic calculation spend {} ms", System.currentTimeMillis() - startTime);
+// log.info("traffic calculation spend {} ms", System.currentTimeMillis() - startTime);
}
} catch (Exception e) {
@@ -134,7 +133,7 @@
try {
Thread.sleep(CORE_SCAN_FREQUENCY_MILLISECOND);
- List<String> actionGroupIds = actionService.selectPrepareGroup();
+ List<String> actionGroupIds = actionService.selectGroupNo(ActionStsType.PREPARE);
for (String actionGroupId : actionGroupIds) {
mainService.publishAction(actionGroupId);
}
@@ -147,29 +146,6 @@
this.actionPublicThread.start();
}
-// @Scheduled(fixedRate = 500) // 500姣鎵ц涓�娆★紝涓嶅悓姝�
-// @Scheduled(fixedDelay = 500) // 500姣鎵ц涓�娆★紝鍚屾
-// @Scheduled(cron = "0/1 * * * * ? ")
-// private void traffic() {
-// List<Segment> segments = segmentService.list(new LambdaQueryWrapper<Segment>()
-// .eq(Segment::getState, SegmentStateType.WAITING.toString())
-// );
-// for (Segment segment : segments) {
-// long startTime = System.currentTimeMillis();
-// trafficService.trigger(segment);
-// log.info("traffic calculation spend {} ms", System.currentTimeMillis() - startTime);
-// }
-// }
-//
-// @Scheduled(cron = "0/1 * * * * ? ")
-// private void publishAction(){
-// List<String> actionGroupIds = actionService.selectPrepareGroup();
-// for (String actionGroupId : actionGroupIds) {
-// long startTime = System.currentTimeMillis();
-// mainService.publishAction(actionGroupId);
-// log.info("publish action calculation spend {} ms", System.currentTimeMillis() - startTime);
-// }
-// }
// patch ----------------------------------------------------------------------------------------------
@@ -213,66 +189,6 @@
if (this.actionPublicThread != null) {
this.actionPublicThread .interrupt();
}
- }
-
-
-
- // 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