From 2f8e173048d22c5b40612c3538b9c1aa5a5397f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 27 三月 2026 13:38:05 +0800
Subject: [PATCH] #乐观锁
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java | 97 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 91 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
index a14c907..160818c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -8,13 +9,23 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.domain.PageResult;
import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.TaskItem;
+import com.vincent.rsf.server.manager.entity.TaskItemLog;
import com.vincent.rsf.server.manager.entity.Wave;
import com.vincent.rsf.server.manager.entity.WaveItem;
+import com.vincent.rsf.server.manager.enums.WaveExceStatus;
+import com.vincent.rsf.server.manager.enums.WaveItemExceStatus;
+import com.vincent.rsf.server.manager.service.OutStockService;
+import com.vincent.rsf.server.manager.service.TaskItemLogService;
+import com.vincent.rsf.server.manager.service.TaskItemService;
import com.vincent.rsf.server.manager.service.WaveService;
+import com.vincent.rsf.server.manager.service.impl.TaskItemLogServiceImpl;
+import com.vincent.rsf.server.manager.service.impl.WaveItemServiceImpl;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
@@ -22,7 +33,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -30,6 +41,14 @@
@Autowired
private WaveService waveService;
+ @Autowired
+ private TaskItemService taskItemService;
+ @Autowired
+ private OutStockService outStockService;
+ @Autowired
+ private TaskItemLogService taskItemLogService;
+ @Autowired
+ private WaveItemServiceImpl waveItemService;
@PreAuthorize("hasAuthority('manager:wave:list')")
@PostMapping("/wave/page")
@@ -73,6 +92,7 @@
@OperationLog("Update 娉㈡鍗曟嵁")
@PostMapping("/wave/update")
public R update(@RequestBody Wave wave) {
+ OptimisticLockUtils.requireVersion("娉㈡", wave.getVersion());
wave.setUpdateBy(getLoginUserId());
wave.setUpdateTime(new Date());
if (!waveService.updateById(wave)) {
@@ -85,10 +105,15 @@
@OperationLog("Delete 娉㈡鍗曟嵁")
@PostMapping("/wave/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
- if (!waveService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ if (Objects.isNull(ids)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("Delete Success").add(ids);
+ List<Long> list = Arrays.asList(ids);
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, list));
+ if (!taskItems.isEmpty()) {
+ throw new CoolException("鏈夋湭瀹屾垚浠诲姟锛屼笉鍙墽琛屽垹闄ゆ搷浣滐紒锛�");
+ }
+ return waveService.cancelWave(list);
}
@PreAuthorize("hasAuthority('manager:wave:list')")
@@ -118,14 +143,24 @@
if (Cools.isEmpty(map) || Cools.isEmpty(map.get("wave"))) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return waveService.publicTask(map);
+ return waveService.publicTask(map, getLoginUserId());
+ }
+
+ @PreAuthorize("hasAuthority('manager:wave:update')")
+ @ApiOperation("閫夋嫨鏄庣粏涓嬪彂浠诲姟")
+ @PostMapping("/wave/selects/task")
+ public R waveToTask(@RequestBody Map<String, Object> map) {
+ if (Cools.isEmpty(map) || Cools.isEmpty(map.get("ids"))) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return waveService.waveToTask(map, getLoginUserId());
}
@PreAuthorize("hasAuthority('manager:wave:list')")
@ApiOperation("娉㈡鍑哄簱浠诲姟棰勮")
@PostMapping("/wave/locs/preview/page")
public R mergeWavePreview(@RequestBody Map<String, Object> map) {
- if (Cools.isEmpty(map.get("wave")) || StringUtils.isBlank(map.get("wave").toString())) {
+ if (Cools.isEmpty(map.get("waveId")) || StringUtils.isBlank(map.get("waveId").toString())) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
Long waveId = Long.parseLong(map.get("waveId").toString());
@@ -135,4 +170,54 @@
return R.ok().add(pageResult);
}
+ @PreAuthorize("hasAuthority('manager:waveItem:update')")
+ @ApiOperation("鏆傚仠涓嬪彂浠诲姟")
+ @PostMapping("/wave/pause/pub/{id}")
+ public R pausePublicTask(@PathVariable Long id) {
+ Wave wave = waveService.getById(id);
+ if (Objects.isNull(wave)) {
+ throw new CoolException("娉㈡鏁版嵁涓嶅瓨鍦紒锛�");
+ }
+ wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_PAUSE.val);
+ if (!waveService.updateById(wave)) {
+ throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ return R.ok();
+ }
+
+ @PreAuthorize("hasAuthority('manager:waveItem:update')")
+ @ApiOperation("缁х画涓嬪彂浠诲姟")
+ @PostMapping("/wave/continue/pub/{id}")
+ public R continuePublicTask(@PathVariable Long id) {
+ Wave wave = waveService.getById(id);
+ if (Objects.isNull(wave)) {
+ throw new CoolException("娉㈡鏁版嵁涓嶅瓨鍦紒锛�");
+ }
+ wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
+ if (!waveService.updateById(wave)) {
+ throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ return R.ok();
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:waveItem:update')")
+ @ApiOperation("缁堟涓嬪彂浠诲姟")
+ @PostMapping("/wave/stop/pub/{id}")
+ public R stopPublicTask(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ Wave wave = waveService.getById(id);
+ if (Objects.isNull(wave)) {
+ throw new CoolException("娉㈡鏁版嵁涓嶅瓨鍦紒锛�");
+ }
+ wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_PAUSE.val);
+ if (!waveService.updateById(wave)) {
+ throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ return waveService.stopPubTask(id);
+ }
+
}
--
Gitblit v1.9.1