From 1b1128dea8ea2a94e89518cdad7b49589e95b469 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 19 三月 2026 15:42:44 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 2 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java | 10 ++++++----
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 3 ++-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java | 7 ++++---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 1 +
5 files changed, 15 insertions(+), 8 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 ae3b643..7224c27 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
@@ -77,7 +77,7 @@
@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.selectInSts(BusStsType.RECEIVE, BusStsType.PROGRESS);
for (Bus bus : busList) {
@@ -88,6 +88,7 @@
@Scheduled(cron = "0/1 * * * * ? ")
private void calculateSeg() throws InterruptedException {
+ if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
if (!this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS)) { return; }
List<Task> taskList = taskService.selectBySts(TaskStsType.WAITING);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
index 2832d5b..e63e83b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -54,6 +54,7 @@
@Scheduled(cron = "0/5 * * * * ? ")
private synchronized void autoCharge(){
+ if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
@@ -94,6 +95,7 @@
@Scheduled(cron = "0/1 * * * * ? ")
// @Scheduled(cron = "0 */2 * * * ? ")
private synchronized void autoStandby(){
+ if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
if (!configService.getVal("automaticStandbyPosition", Boolean.class)) { return; }
List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java
index 14ec959..dfc8a73 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java
@@ -6,10 +6,13 @@
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.service.*;
import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
+import com.zy.acs.manager.core.service.AreaGovernService;
+import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.entity.*;
-import com.zy.acs.manager.manager.enums.*;
+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.service.*;
import com.zy.acs.manager.manager.service.impl.CodeServiceImpl;
import com.zy.acs.manager.manager.service.impl.TaskServiceImpl;
@@ -17,13 +20,12 @@
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.*;
import java.util.stream.Collectors;
@Slf4j
-@Component
+//@Component
public class AutoRunScheduler {
private static final AgvModelType DEFAULT_AGV_MODEL = AgvModelType.CTU_BOX_TRANSPORT_AGV;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java
index 3cc735d..7ebe7fb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainLockWrapService.java
@@ -1,15 +1,15 @@
package com.zy.acs.manager.core.service;
+import com.zy.acs.common.utils.News;
import com.zy.acs.framework.exception.CoolException;
-import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.Jam;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskTypeType;
+import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import com.zy.acs.common.utils.News;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -27,6 +27,8 @@
@Autowired
private MainService mainService;
+ @Autowired
+ private ConfigService configService;
public void buildMajorTask(Long agvId, List<Task> taskList) {
boolean lockAcquired = false;
@@ -53,7 +55,6 @@
if (!(lockAcquired = this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS))) {
throw new CoolException("failed to generate [minor task] actions, cause can not acquire lock ...");
}
-// News.info("buildMinorTask AGV[{}] lock time: {}", agv.getUuid(), System.currentTimeMillis());
return mainService.buildMinorTask(agvId, taskType, destination, jam);
} catch (Exception e) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
index 258a2db..a3fab57 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
@@ -184,6 +184,7 @@
}
private void patrolOfMove(String agvNo) {
+ if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
Long agvId = agvService.getAgvId(agvNo);
if (0 < travelService.count(new LambdaQueryWrapper<Travel>()
.eq(Travel::getAgvId, agvId)
--
Gitblit v1.9.1