From 7b0d620dcacaeb5b1ee6c945fe7159c9b75432b0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 27 九月 2024 14:18:49 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 7a0f298..14c59a0 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
@@ -1,6 +1,9 @@
package com.zy.acs.manager.manager.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.controller.result.MissionVo;
+import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.enums.SegmentStateType;
import com.zy.acs.manager.manager.service.MissionService;
import com.zy.acs.manager.manager.service.SegmentService;
@@ -9,6 +12,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* Created by vincent on 9/27/2024
@@ -24,13 +28,31 @@
List<MissionVo> result = new ArrayList<>();
List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.RUNNING);
for (String groupNo : runningGroupNos) {
- MissionVo vo = new MissionVo();
-
- vo.setGroupNo(groupNo);
- result.add(vo);
+ MissionVo vo = generate(groupNo);
+ if (null != vo) {
+ result.add(vo);
+ }
}
return result;
}
+ public MissionVo generate(String groupNo) {
+ List<Segment> list = segmentService.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupNo).orderByAsc(Segment::getSerial));
+ if (Cools.isEmpty(list)) {
+ return null;
+ }
+ Segment segment = list.get(0);
+
+ MissionVo vo = new MissionVo();
+ 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