From 2f0c77e7d871a1119d6cb143721bd920a6850e93 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 27 三月 2025 09:59:40 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
index f37814e..b9bd4c9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -25,6 +25,8 @@
public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {
@Autowired
+ private BusService busService;
+ @Autowired
private CodeService codeService;
@Autowired
private LocService locService;
@@ -94,6 +96,7 @@
if (!this.updateById(task)) {
throw new CoolException(BaseRes.ERROR);
}
+ busService.checkoutComplete(task.getBusId());
return Boolean.TRUE;
}
@@ -112,6 +115,7 @@
if (!this.updateById(task)) {
throw new CoolException(BaseRes.ERROR);
}
+ busService.checkoutComplete(task.getBusId());
return Boolean.TRUE;
}
@@ -135,7 +139,7 @@
if (null == codeId) {
return null;
}
- return laneService.search(codeService.getById(codeId).getData());
+ return laneService.search(codeService.getCacheById(codeId).getData());
}
@Override
@@ -158,7 +162,7 @@
if (null == codeId) {
return null;
}
- return laneService.search(codeService.getById(codeId).getData());
+ return laneService.search(codeService.getCacheById(codeId).getData());
}
@Override
@@ -176,7 +180,7 @@
}
@Override
- public List<Task> findRunningTasksByAgv(Long agvId) {
+ public List<Task> findTransportTasksByAgv(Long agvId) {
if (null == agvId) {
return new ArrayList<>();
}
@@ -186,6 +190,28 @@
return this.list(wrapper);
}
+ @Override
+ public Integer findTransportTasksCountByAgv(Long agvId) {
+ LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>().eq(Task::getAgvId, agvId);
+ wrapper.in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val());
+ wrapper.notIn(Task::getTaskType, TaskTypeType.MOVE.val(), TaskTypeType.TO_CHARGE.val(), TaskTypeType.TO_STANDBY.val());
+ return this.count(wrapper);
+ }
+
+ @Override
+ public Task findLatestTask(Long agvId, TaskStsType taskSts) {
+ LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>()
+ .orderByDesc(Task::getCreateTime)
+ .last("limit 0, 1");
+ if (null != agvId) {
+ wrapper.eq(Task::getAgvId, agvId);
+ }
+ if (null != taskSts) {
+ wrapper.eq(Task::getTaskSts, taskSts.val());
+ }
+ return this.list(wrapper).stream().findFirst().orElse(null);
+ }
+
@Transactional
public void maintainLocSts(Task task, Boolean complete) {
Loc oriLoc = null; Loc destLoc = null;
--
Gitblit v1.9.1