From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwBoxController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 794d733..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>
@@ -88,7 +89,7 @@
*/
@ApiOperation("批量修改转运箱状态")
@PostMapping("/editBatch")
- public R<?> editBatch(@Valid @RequestBody List<MwBoxDTO> dtoList) {
+ public R<?> editBatch(@Valid @RequestBody MwBoxDTO dtoList) {
boxService.editBatch(dtoList);
return R.ok();
}
@@ -101,7 +102,9 @@
*/
@ApiOperation("批量删除")
@PostMapping("/delBatch")
- public R<?> delBatch(@ApiParam(name = "idList", value = "转运箱id列表", required = true, allowMultiple = true) @NotEmpty(message = "转运箱列表不能为空") @RequestBody List<Long> idList) {
+ @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