From 9f19c2ea1a1d4e94460eb2d881b7cf8cc10e66df Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 14 十一月 2024 10:42:10 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 93c2025..49aa6a6 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -44,6 +45,8 @@
@Autowired
private MainService mainService;
@Autowired
+ private MainLockWrapService mainLockWrapService;
+ @Autowired
private ActionService actionService;
@Autowired
private SegmentService segmentService;
@@ -58,7 +61,7 @@
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();
}
@@ -81,7 +84,7 @@
}
for (AgvTaskDto dto : taskDtoList) {
- mainService.buildMajorTask(dto.getAgvId(), dto.getTaskList());
+ mainLockWrapService.buildMajorTask(dto.getAgvId(), dto.getTaskList());
}
this.lock.unlock();
}
--
Gitblit v1.9.1