From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwBoxController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwBoxController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwBoxController.java
index c3f093d..47716a8 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwBoxController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwBoxController.java
@@ -11,7 +11,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +22,9 @@
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -58,8 +59,8 @@
* @param query
* @return
*/
- @PostMapping("/page")
@ApiOperation("转运箱分页列表")
+ @PostMapping("/page")
public R<PageDTO<MwBoxVO>> pageList(@Valid @RequestBody MwBoxPageQuery query) {
return R.ok(boxService.pageList(query));
}
@@ -71,8 +72,8 @@
* @param boxNumberEnd
* @return
*/
- @PostMapping("/add")
@ApiOperation("新增转运箱")
+ @PostMapping("/add")
@ApiImplicitParams({@ApiImplicitParam(name = "boxNumberStart", value = "转运箱编号开始", required = true),
@ApiImplicitParam(name = "boxNumberEnd", value = "转运箱编号结束", required = true)})
public R<?> add(@RequestParam String boxNumberStart, @RequestParam String boxNumberEnd) {
@@ -86,9 +87,9 @@
* @param dtoList
* @return
*/
- @PostMapping("/editBatch")
@ApiOperation("批量修改转运箱状态")
- public R<?> editBatch(@Valid @RequestBody List<MwBoxDTO> dtoList) {
+ @PostMapping("/editBatch")
+ public R<?> editBatch(@Valid @RequestBody MwBoxDTO dtoList) {
boxService.editBatch(dtoList);
return R.ok();
}
@@ -99,9 +100,11 @@
* @param idList
* @return
*/
- @PostMapping("/delBatch")
@ApiOperation("批量删除")
- public R<?> delBatch(@ApiParam(name = "idList", value = "转运箱id列表", required = true, allowMultiple = true) @NotEmpty(message = "转运箱列表不能为空") @RequestBody List<Long> idList) {
+ @PostMapping("/delBatch")
+ @ApiImplicitParam(name = "idStr", value = "转运箱id字符串，多个用逗号分隔", required = true)
+ public R<?> delBatch(@RequestParam @NotEmpty(message = "转运箱id字符串不能为空") String idStr) {
+ List<Long> idList = Arrays.stream(idStr.split(",")).map(Long::valueOf).collect(Collectors.toList());
boxService.removeByIds(idList);
return R.ok();
}
--
Gitblit v1.7.1