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 | 11 +++++++----
1 files changed, 7 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 911276d..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
@@ -5,6 +5,7 @@
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;
@@ -28,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;
@@ -109,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()
--
Gitblit v1.9.1