From 4f3150a0a2d6b3585c26df7afe1a6f5f57423b3c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 29 九月 2024 10:00:40 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
index d6ef3a6..7b50ca0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* Created by vincent on 9/27/2024
@@ -23,11 +24,11 @@
private SegmentService segmentService;
@Override
- public List<MissionVo> getList() {
+ public List<MissionVo> getList(Long agvId, String groupNo) {
List<MissionVo> result = new ArrayList<>();
- List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.RUNNING);
- for (String groupNo : runningGroupNos) {
- MissionVo vo = generate(groupNo);
+ List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.RUNNING, agvId, groupNo);
+ for (String runningGroupNo : runningGroupNos) {
+ MissionVo vo = generate(runningGroupNo);
if (null != vo) {
result.add(vo);
}
@@ -37,7 +38,7 @@
}
public MissionVo generate(String groupNo) {
- List<Segment> list = segmentService.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupNo));
+ List<Segment> list = segmentService.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupNo).orderByAsc(Segment::getSerial));
if (Cools.isEmpty(list)) {
return null;
}
@@ -47,7 +48,10 @@
vo.setGroupNo(groupNo);
vo.setId(segment.getId());
vo.setPosType(segment.getPosType());
-
+ vo.setAgv(segment.getAgvId$());
+ vo.setTaskNos(list.stream().map(Segment::getTaskId$).collect(Collectors.toList()));
+ vo.setBackpack(segment.getBackpack());
+ vo.setDestCode(segment.getEndNode$());
return vo;
}
--
Gitblit v1.9.1