From 89c7f6e5bcc21b0e8f83a2bc6d680e2ffe431e6f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 13 一月 2025 09:38:29 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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..a2df1e6 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());
}
@@ -58,7 +58,7 @@
}
@Override
- public Segment getJustWaitingSeg(Long agvId) {
+ public List<Segment> getJustWaitingSeg(Long agvId) {
if (null == agvId) {
return null;
}
@@ -69,7 +69,7 @@
if (waitingSegList.size() > 1) {
log.error("{}鍙疯溅杈嗗瓨鍦ㄥ涓瓑寰呬腑鐨凷egment锛侊紒锛�", agvService.getById(agvId).getUuid());
}
- return waitingSegList.get(0);
+ return waitingSegList;
}
}
@@ -92,4 +92,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