From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 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 88ebbe5..726c6cc 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
@@ -9,17 +9,24 @@
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.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
@@ -27,7 +34,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
@@ -37,31 +44,38 @@
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")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Wave, BaseParam> pageParam = new PageParam<>(baseParam, Wave.class);
- return R.ok().add(waveService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Wave, BaseParam> page = waveService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:wave:list')")
@PostMapping("/wave/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(waveService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveService.list()));
}
@PreAuthorize("hasAuthority('manager:wave:list')")
@PostMapping({"/wave/many/{ids}", "/waves/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(waveService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:wave:list')")
@GetMapping("/wave/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(waveService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:wave:save')")
@@ -73,19 +87,20 @@
if (!waveService.save(wave)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(wave);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(wave));
}
@PreAuthorize("hasAuthority('manager:wave:update')")
@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)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(wave);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(wave));
}
@PreAuthorize("hasAuthority('manager:wave:remove')")
@@ -114,13 +129,13 @@
waveService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:wave:list')")
@PostMapping("/wave/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(waveService.list(), Wave.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(waveService.list()), Wave.class), response);
}
@PreAuthorize("hasAuthority('manager:wave:update')")
@@ -154,16 +169,21 @@
List<WaveItem> waveItems = waveService.mergeWavePreview(waveId);
PageResult<WaveItem> pageResult = new PageResult<>();
pageResult.setRecords(waveItems).setTotal(Long.parseLong(waveItems.size() + ""));
- return R.ok().add(pageResult);
+ return R.ok().add(buildPageRowsUtils.rowsMap(pageResult));
}
@PreAuthorize("hasAuthority('manager:waveItem:update')")
@ApiOperation("鏆傚仠涓嬪彂浠诲姟")
@PostMapping("/wave/pause/pub/{id}")
public R pausePublicTask(@PathVariable Long id) {
- waveService.update(new LambdaUpdateWrapper<Wave>()
- .eq(Wave::getId, id)
- .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_PAUSE.val));
+ 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();
}
@@ -171,11 +191,35 @@
@ApiOperation("缁х画涓嬪彂浠诲姟")
@PostMapping("/wave/continue/pub/{id}")
public R continuePublicTask(@PathVariable Long id) {
- waveService.update(new LambdaUpdateWrapper<Wave>()
- .eq(Wave::getId, id)
- .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val));
+ 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