From ef24ea7286c496625dfc74aff2723ffdbd9b0049 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 29 十二月 2025 11:11:00 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 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 a00deae..f9641ba 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
@@ -1,6 +1,8 @@
package com.zy.acs.manager.manager.service.impl;
+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.manager.common.exception.BusinessException;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.StaReserve;
@@ -17,12 +19,16 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.List;
+import java.util.Objects;
import java.util.Optional;
@Service("staReserveService")
public class StaReserveServiceImpl extends ServiceImpl<StaReserveMapper, StaReserve> implements StaReserveService {
public static final Long RESERVE_EXPIRE_TIME = 30 * 60 * 1000L;
+
+ public static final Integer DEFAULT_QTY = 1;
@Autowired
private StaService staService;
@@ -32,7 +38,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public StaReserve reserveStaIn(Sta sta, Task task, Integer qty) {
- qty = Optional.ofNullable(qty).orElse(1);
+ qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
// reserve sta in
if (staMapper.tryReserveIn(sta.getId(), qty) < qty) {
@@ -66,7 +72,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public StaReserve reserveStaOut(Sta sta, Task task, Integer qty) {
- qty = Optional.ofNullable(qty).orElse(1);
+ qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
// reserve sta out
if (staMapper.tryReserveOut(sta.getId(), qty) < qty) {
@@ -100,8 +106,44 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public Boolean waitingStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
+ qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
+
+ // update reserve to be waiting state
+ if (0 < this.baseMapper.updateStateToWaiting(sta.getId()
+ , task.getId()
+ , type.toString()
+ , StaReserveStateType.WAITING.toString())) {
+ return true;
+ }
+
+ List<StaReserve> list = this.list(new LambdaQueryWrapper<StaReserve>()
+ .eq(StaReserve::getStaId, sta.getId())
+ .eq(StaReserve::getTaskId, task.getId())
+ .eq(StaReserve::getType, type.toString())
+ .eq(StaReserve::getStatus, StatusType.ENABLE.val)
+ );
+
+ if (Cools.isEmpty(list)) {
+ return false;
+ }
+
+ StaReserve reserve = list.get(0);
+
+ StaReserveStateType stateType = StaReserveStateType.of(reserve.getState());
+ switch (Objects.requireNonNull(stateType)) {
+ case WAITING:
+ case CONFIRMED:
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public void confirmStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
- qty = Optional.ofNullable(qty).orElse(1);
+ qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
// update reserve state to be confirmed
if (0 == this.baseMapper.updateState(task.getId(), sta.getId(), type.toString(), StaReserveStateType.CONFIRMED.toString())) {
@@ -127,7 +169,7 @@
@Override
public void cancelStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
- qty = Optional.ofNullable(qty).orElse(1);
+ qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
// update reserve state to be canceled
if (0 == this.baseMapper.updateState(task.getId(), sta.getId(), type.toString(), StaReserveStateType.CANCELLED.toString())) {
--
Gitblit v1.9.1