From bfe51f9c2ce2181fee372ed5f9017c7af59cc896 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 01 九月 2025 12:49:55 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 68 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
index da6a106..58cafeb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
@@ -2,17 +2,21 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.manager.entity.Segment;
+import com.zy.acs.manager.manager.entity.Task;
+import com.zy.acs.manager.manager.enums.ActionStsType;
import com.zy.acs.manager.manager.enums.SegmentStateType;
+import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.mapper.SegmentMapper;
-import com.zy.acs.manager.manager.service.AgvService;
-import com.zy.acs.manager.manager.service.SegmentService;
+import com.zy.acs.manager.manager.service.*;
import com.zy.acs.framework.common.Cools;
-import com.zy.acs.manager.manager.service.TravelService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
@@ -25,10 +29,13 @@
private AgvService agvService;
@Autowired
private TravelService travelService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private ActionService actionService;
@Override
public void processNext(List<Segment> segmentList) {
- Date now = new Date();
segmentList.stream().max(Comparator.comparingInt(Segment::getSerial)).ifPresent(segment -> {
Segment nextSegment = this.getNextStepOfInit(segment.getTravelId(), segment.getSerial());
@@ -36,7 +43,7 @@
if (null != nextSegment) {
nextSegment.setState(SegmentStateType.WAITING.toString());
- nextSegment.setUpdateTime(now);
+ nextSegment.setUpdateTime(new Date());
if (!this.updateById(nextSegment)) {
log.error("Segment [{}] failed to update 锛侊紒锛�", nextSegment.getGroupId() + " - " + nextSegment.getSerial());
}
@@ -58,7 +65,17 @@
}
@Override
- public Segment getJustWaitingSeg(Long agvId) {
+ public Segment getPreviousStepOfFinish(Long travelId, Integer serial, String memo) {
+ return this.getOne(new LambdaQueryWrapper<Segment>()
+ .eq(Segment::getTravelId, travelId)
+ .eq(Segment::getSerial, serial - 1)
+// .eq(Segment::getState, SegmentStateType.FINISH.toString())
+ .eq(Segment::getMemo, memo)
+ );
+ }
+
+ @Override
+ public List<Segment> getJustWaitingSeg(Long agvId) {
if (null == agvId) {
return null;
}
@@ -69,7 +86,7 @@
if (waitingSegList.size() > 1) {
log.error("{}鍙疯溅杈嗗瓨鍦ㄥ涓瓑寰呬腑鐨凷egment锛侊紒锛�", agvService.getById(agvId).getUuid());
}
- return waitingSegList.get(0);
+ return waitingSegList;
}
}
@@ -92,4 +109,41 @@
return this.baseMapper.getGroupNo(state.toString(), agvId, groupNo);
}
+ @Override
+ public List<Segment> getRunningByEndCode(Long codeId) {
+ if (null == codeId) {
+ return new ArrayList<>();
+ }
+ return this.list(new LambdaQueryWrapper<Segment>()
+ .eq(Segment::getEndNode, codeId)
+ .in(Segment::getState, SegmentStateType.WAITING.toString(), SegmentStateType.RUNNING.toString())
+ );
+ }
+
+ @Override
+ @Transactional
+ public Boolean cancel(Long segmentId, Long userId) {
+ Date now = new Date();
+ Segment segment = this.getById(segmentId);
+ String groupId = segment.getGroupId();
+ // update segment list
+ List<Segment> segmentList = this.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupId));
+ for (Segment seg : segmentList) {
+ Task task = taskService.getById(segment.getTaskId());
+ if (task != null &&
+ (!task.getTaskSts().equals(TaskStsType.COMPLETE.val()) && !task.getTaskSts().equals(TaskStsType.CANCEL.val()))) {
+ throw new CoolException("the task is not finish");
+ }
+ seg.setState(SegmentStateType.FINISH.toString());
+ seg.setUpdateTime(now);
+ if (!this.updateById(seg)) {
+ throw new CoolException("failed to cancel segment");
+ }
+ }
+ this.processNext(segmentList);
+ // update action list
+ actionService.updateStsByGroupId(groupId, ActionStsType.EXPIRED.val());
+ return Boolean.TRUE;
+ }
+
}
--
Gitblit v1.9.1