From b03d89e792a34c486f0afeab69e837f85d8cbe16 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java
index e4b8936..c730c06 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java
@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
+import java.util.List;
/**
* <p>
@@ -46,8 +47,8 @@
* @param query
* @return
*/
- @PostMapping("/page")
@ApiOperation("防护器具分页列表")
+ @PostMapping("/page")
public R<PageDTO<MwProtectionEquipmentVO>> pageList(@Valid @RequestBody MwProtectionEquipmentQuery query) {
return R.ok(mwProtectionEquipmentService.pageList(query));
}
@@ -58,8 +59,8 @@
* @param id
* @return
*/
- @GetMapping("/{id}")
@ApiOperation("详情")
+ @GetMapping("/{id}")
public R<MwProtectionEquipmentVO> detail(@ApiParam(name = "id", value = "防护器具id", required = true) @PathVariable("id") Long id) {
return R.ok(mwProtectionEquipmentService.detail(id));
}
@@ -70,8 +71,8 @@
* @param dto
* @return
*/
- @PostMapping("/add")
@ApiOperation("新增防护器具")
+ @PostMapping("/add")
public R<?> add(@Valid @RequestBody MwProtectionEquipmentDTO dto) {
mwProtectionEquipmentService.add(dto);
return R.ok();
@@ -83,8 +84,8 @@
* @param dto
* @return
*/
- @PostMapping("/edit")
@ApiOperation("编辑")
+ @PostMapping("/edit")
public R<?> edit(@Valid @RequestBody MwProtectionEquipmentDTO dto) {
mwProtectionEquipmentService.edit(dto);
return R.ok();
@@ -95,8 +96,8 @@
* @param id
* @return
*/
- @DeleteMapping("/{id}")
@ApiOperation("删除")
+ @DeleteMapping("/{id}")
public R<?> delete(@ApiParam(name = "id", value = "防护器具id", required = true) @PathVariable("id") Long id) {
mwProtectionEquipmentService.delete(id);
return R.ok();
@@ -107,8 +108,8 @@
*
* @param dto
*/
- @PostMapping("/addStock")
@ApiOperation("增加库存")
+ @PostMapping("/addStock")
public R<?> addStock(@Valid @RequestBody MwProtectionEquipmentRecordDTO dto) {
mwProtectionEquipmentService.addStock(dto);
return R.ok();
@@ -120,10 +121,20 @@
* @param query
* @return
*/
- @PostMapping("/recordPage")
@ApiOperation("增减记录")
+ @PostMapping("/recordPage")
public R<PageDTO<MwProtectionEquipmentRecordVO>> recordPage(@Valid @RequestBody MwProtectionEquipmentRecordQuery query) {
return R.ok(mwProtectionEquipmentService.recordPage(query));
}
+ /**
+ * 防护器具列表
+ *
+ * @return
+ */
+ @ApiOperation("防护器具列表")
+ @GetMapping("/list")
+ public R<List<MwProtectionEquipmentVO>> queryList() {
+ return R.ok(mwProtectionEquipmentService.queryList());
+ }
}
--
Gitblit v1.7.1