From 7eda23cbb33c23c4f2f9cda3a42d851efcc0ffe5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 五月 2026 09:46:33 +0800
Subject: [PATCH] 取消魔法值
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 76 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 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 58cafeb..c184621 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,7 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
+import com.zy.acs.manager.common.constant.Constants;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.ActionStsType;
@@ -10,7 +12,6 @@
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.mapper.SegmentMapper;
import com.zy.acs.manager.manager.service.*;
-import com.zy.acs.framework.common.Cools;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
private TaskService taskService;
@Autowired
private ActionService actionService;
+ @Autowired
+ private CodeService codeService;
@Override
public void processNext(List<Segment> segmentList) {
@@ -57,20 +60,28 @@
@Override
public Segment getNextStepOfInit(Long travelId, Integer serial) {
+// return this.getOne(new LambdaQueryWrapper<Segment>()
+// .eq(Segment::getTravelId, travelId)
+// .eq(Segment::getSerial, serial + 1)
+// .eq(Segment::getState, SegmentStateType.INIT.toString())
+// );
+ // 涓嶆槸鍥哄畾鏌ヨ涓�涓紝鑰屾槸鏌ヨ涓�涓墖娈碉紝鍥犱负瀛樺湪浜轰负瀹岀粨浠诲姟瀵艰嚧鏌ヤ笉鍒颁笅涓�涓�+1鐨勭墖娈�
return this.getOne(new LambdaQueryWrapper<Segment>()
.eq(Segment::getTravelId, travelId)
- .eq(Segment::getSerial, serial + 1)
.eq(Segment::getState, SegmentStateType.INIT.toString())
+ .orderByDesc(Segment::getSerial)
+ .last(Constants.LIMIT_ONE)
);
}
@Override
- public Segment getPreviousStepOfFinish(Long travelId, Integer serial, String memo) {
+ public Segment getPreviousStepOfFinish(Long travelId, Integer serial) {
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)
+ .eq(Segment::getState, SegmentStateType.FINISH.toString())
+ .orderByDesc(Segment::getId)
+ .last(Constants.LIMIT_ONE)
);
}
@@ -125,9 +136,10 @@
public Boolean cancel(Long segmentId, Long userId) {
Date now = new Date();
Segment segment = this.getById(segmentId);
+ Long travelId = segment.getTravelId();
String groupId = segment.getGroupId();
// update segment list
- List<Segment> segmentList = this.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupId));
+ List<Segment> segmentList = this.list(new LambdaQueryWrapper<Segment>().eq(Segment::getTravelId, travelId));
for (Segment seg : segmentList) {
Task task = taskService.getById(segment.getTaskId());
if (task != null &&
@@ -142,8 +154,58 @@
}
this.processNext(segmentList);
// update action list
- actionService.updateStsByGroupId(groupId, ActionStsType.EXPIRED.val());
+ if (!Cools.isEmpty(groupId)) {
+ actionService.updateStsByGroupId(groupId, ActionStsType.EXPIRED.val());
+ }
return Boolean.TRUE;
}
+ @Override
+ public Segment getCurrWaitingSeg(Long travelId, Long agvId) {
+ List<Segment> segments = this.list(new LambdaQueryWrapper<Segment>()
+ .eq(Segment::getTravelId, travelId)
+ .eq(Segment::getAgvId, agvId)
+ .eq(Segment::getState, SegmentStateType.WAITING.toString())
+ .orderByDesc(Segment::getId)
+ );
+ if (Cools.isEmpty(segments)) {
+ }
+ return segments.stream().findFirst().orElse(null);
+ }
+
+ @Override
+ public Segment getCurrRunningSeg(Long travelId, Long agvId, Long codeId) {
+ if (null == agvId) {
+ return null;
+ }
+ LambdaQueryWrapper<Segment> wrapper = new LambdaQueryWrapper<Segment>()
+ .eq(Segment::getAgvId, agvId)
+ .eq(Segment::getState, SegmentStateType.RUNNING.toString());
+ if (null != travelId) {
+ wrapper.eq(Segment::getTravelId, travelId);
+ }
+ if (null != codeId) {
+ wrapper.eq(Segment::getEndNode, codeId);
+ }
+ wrapper.orderByDesc(Segment::getId);
+ List<Segment> segments = this.list(wrapper);
+ if (Cools.isEmpty(segments)) {
+ }
+ return segments.stream().findFirst().orElse(null);
+ }
+
+ @Override
+ public List<Integer> selectUsedBackpacks(Long travelId, Long agvId) {
+ return this.baseMapper.selectUsedBackpacks(travelId, agvId);
+ }
+
+ @Override
+ public Boolean isRollerWaiting(Long agvId) {
+ return 0 < this.count(new LambdaQueryWrapper<Segment>()
+ .eq(Segment::getAgvId, agvId)
+ .eq(Segment::getState, SegmentStateType.WAITING.toString())
+ .eq(Segment::getRollerWaiting, 1)
+ );
+ }
+
}
--
Gitblit v1.9.1