From cd67e854d4715bc92a16dc7bffdbde7be1da9957 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 27 三月 2025 13:02:37 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 c17f43c..b8eca35 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
@@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
@@ -28,7 +29,6 @@
@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 +36,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());
}
@@ -54,6 +54,16 @@
.eq(Segment::getTravelId, travelId)
.eq(Segment::getSerial, serial + 1)
.eq(Segment::getState, SegmentStateType.INIT.toString())
+ );
+ }
+
+ @Override
+ 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)
);
}
@@ -92,4 +102,15 @@
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())
+ );
+ }
+
}
--
Gitblit v1.9.1