From 067ea036e9044d8e57d0d1abaddd66f13f745e6a Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 02 二月 2026 12:54:54 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java | 91 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 87 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
index 9dee9af..7c6c9a9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
@@ -3,13 +3,16 @@
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.exception.BusinessException;
+import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.StaReserve;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.StaReserveStateType;
import com.zy.acs.manager.manager.enums.StaReserveType;
import com.zy.acs.manager.manager.enums.StatusType;
+import com.zy.acs.manager.manager.enums.TaskTypeType;
import com.zy.acs.manager.manager.mapper.StaMapper;
import com.zy.acs.manager.manager.mapper.StaReserveMapper;
import com.zy.acs.manager.manager.service.StaReserveService;
@@ -26,8 +29,8 @@
@Service("staReserveService")
public class StaReserveServiceImpl extends ServiceImpl<StaReserveMapper, StaReserve> implements StaReserveService {
- public static final Long RESERVE_EXPIRE_TIME = 30 * 60 * 1000L;
- public static final Long WAITING_EXPIRE_TIME = 5 * 60 * 1000L;
+ public static final Long RESERVE_EXPIRE_TIME = 30 * 60L;
+ public static final Long WAITING_EXPIRE_TIME = 5 * 60L;
public static final Integer DEFAULT_QTY = 1;
@@ -107,11 +110,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean waitingStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
+ public Boolean waitingStaReserve(Sta sta, Task task, Segment seg, Integer qty, StaReserveType type) {
qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
// update reserve to be waiting state
- int changed = this.baseMapper.updateStateToWaiting(task.getId()
+ int changed = this.baseMapper.updateStateToWaiting(
+ task.getId()
+ , seg.getId()
, sta.getId()
, type.toString()
, StaReserveStateType.WAITING.toString()
@@ -208,6 +213,84 @@
}
}
+ @Override
+ public void allocateCallBack(Task task, Long agvId) {
+ if (Cools.isEmpty(task, agvId)) {
+ return;
+ }
+ TaskTypeType taskType = TaskTypeType.get(task.getTaskTypeEl());
+ if (null == taskType) {
+ return;
+ }
+ Date now = new Date();
+ StaReserve inStaReserve = null;
+ StaReserve outStaReserve = null;
+ switch (taskType) {
+ case LOC_TO_STA:
+ inStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
+ .eq(StaReserve::getTaskId, task.getId())
+ .eq(StaReserve::getStaId, task.getDestSta())
+ .eq(StaReserve::getType, StaReserveType.IN.toString())
+ .eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
+// .gt(StaReserve::getExpireTime, now)
+ );
+ if (null == inStaReserve) {
+ throw new CoolException("failed to find out sta reserve");
+ }
+ break;
+ case STA_TO_LOC:
+ outStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
+ .eq(StaReserve::getTaskId, task.getId())
+ .eq(StaReserve::getStaId, task.getOriSta())
+ .eq(StaReserve::getType, StaReserveType.OUT.toString())
+ .eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
+// .gt(StaReserve::getExpireTime, now)
+ );
+ if (null == outStaReserve) {
+ throw new CoolException("failed to find out sta reserve");
+ }
+ break;
+ case STA_TO_STA:
+ inStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
+ .eq(StaReserve::getTaskId, task.getId())
+ .eq(StaReserve::getStaId, task.getDestSta())
+ .eq(StaReserve::getType, StaReserveType.IN.toString())
+ .eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
+// .gt(StaReserve::getExpireTime, now)
+ );
+ outStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
+ .eq(StaReserve::getTaskId, task.getId())
+ .eq(StaReserve::getStaId, task.getOriSta())
+ .eq(StaReserve::getType, StaReserveType.OUT.toString())
+ .eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
+// .gt(StaReserve::getExpireTime, now)
+ );
+ if (null == inStaReserve) {
+ throw new CoolException("failed to find out sta reserve");
+ }
+ if (null == outStaReserve) {
+ throw new CoolException("failed to find out sta reserve");
+ }
+ break;
+ default:
+ return;
+ }
+ if (null != inStaReserve) {
+ inStaReserve.setAgvId(agvId);
+ inStaReserve.setUpdateTime(now);
+ if (!this.updateById(inStaReserve)) {
+ throw new CoolException("failed to update sta reserve");
+ }
+ }
+ if (null != outStaReserve) {
+ outStaReserve.setAgvId(agvId);
+ outStaReserve.setUpdateTime(now);
+ if (!this.updateById(outStaReserve)) {
+ throw new CoolException("failed to update sta reserve");
+ }
+ }
+ }
+
private String generateReserveUniqKey(Long staId, Long taskId, StaReserveType type) {
return "STA:" + staId + "-TASK:" + taskId + "-T:" + type.toString();
--
Gitblit v1.9.1