From fe9a623b42b02e7fcd112f6a85d55b3beeb58d2e Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期四, 27 三月 2025 17:51:45 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentController.java
index a6f2a8e..b4d8a1f 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentController.java
@@ -11,16 +11,17 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import java.util.List;
+import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
/**
* <p>
@@ -44,8 +45,8 @@
* @param query
* @return
*/
- @PostMapping("/page")
@ApiOperation("设备管理分页列表")
+ @PostMapping("/page")
public R<PageDTO<MwMicroEquipmentVO>> pageList(@Valid @RequestBody MwMicroEquipmentQuery query) {
return R.ok(mwMicroEquipmentService.pageList(query));
}
@@ -56,8 +57,8 @@
* @param dto
* @return
*/
- @PostMapping("/add")
@ApiOperation("新增设备")
+ @PostMapping("/add")
public R<?> add(@Valid @RequestBody MwMicroEquipmentDTO dto) {
mwMicroEquipmentService.add(dto);
return R.ok();
@@ -69,8 +70,8 @@
* @param dto
* @return
*/
- @PostMapping("/edit")
@ApiOperation("编辑设备")
+ @PostMapping("/edit")
public R<?> edit(@Valid @RequestBody MwMicroEquipmentDTO dto) {
mwMicroEquipmentService.edit(dto);
return R.ok();
@@ -82,8 +83,8 @@
* @param id
* @return
*/
- @DeleteMapping("/{id}")
@ApiOperation("删除")
+ @DeleteMapping("/{id}")
public R<?> delete(@ApiParam(name = "id", value = "设备id", required = true) @PathVariable("id") Long id) {
mwMicroEquipmentService.removeById(id);
return R.ok();
@@ -95,10 +96,21 @@
* @param query
* @return
*/
- @PostMapping("/storedMedicalWastePage")
@ApiOperation("待处理的医废列表")
+ @PostMapping("/storedMedicalWastePage")
public R<PageDTO<MwMedicalWasteBoxVO>> storedMedicalWastePage(@Valid @RequestBody StorageRecordQuery query) {
return R.ok(mwMicroEquipmentService.storedMedicalWastePage(query));
}
-
+
+ /**
+ * 微型设备列表
+ *
+ * @return
+ */
+ @ApiOperation("微型设备列表")
+ @GetMapping("/list/{departmentId}")
+ public R<List<MwMicroEquipmentVO>> getList(
+ @ApiParam(name = "departmentId", value = "医院id", required = true) @PathVariable("departmentId") Long departmentId) {
+ return R.ok(mwMicroEquipmentService.getList(departmentId));
+ }
}
--
Gitblit v1.7.1