From c83b3ad4e7d3fc8da48eafcd45dd46de0262f138 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 一月 2025 16:51:50 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
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 d9cca2f..bbc1028 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
@@ -34,7 +34,7 @@
@Service
public class PatrolService {
- private static final int SCHEDULE_TIME_INTERVAL = 300;
+ private static final int SCHEDULE_TIME_INTERVAL = 100;
public static final Map<String, ScheduledFuture<?>> AGV_PATROL_MAP = new ConcurrentHashMap<>();
@@ -66,20 +66,18 @@
}
private void patrolOfMove(String agvNo) {
- Agv agv = agvService.selectByUuid(agvNo);
- AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+ Long agvId = agvService.getAgvId(agvNo);
+ AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agvId);
if (taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getAgvId, agv.getId())
- .and(i -> {
- i.eq(Task::getTaskSts, TaskStsType.WAITING.val())
- .or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
- .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
- })) > 0) {
+ .eq(Task::getAgvId, agvId)
+ .in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
+ ) > 0) {
return;
}
- if (!agvService.judgeEnable(agv.getId())) {
+ if (!agvService.judgeEnable(agvId)) {
return;
}
+ Agv agv = agvService.getById(agvId);
Code destinationCode = this.getDestinationCode(agv, agvDetail);
if (null == destinationCode) {
return;
--
Gitblit v1.9.1