From fb2f97c1e66abc8a6d06287213187ce23dd5d7e0 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 11 三月 2025 10:26:21 +0800
Subject: [PATCH] lims检测中心设备联调
---
cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceController.java b/cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceController.java
index 55898d2..4839fa0 100644
--- a/cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceController.java
+++ b/cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceController.java
@@ -78,11 +78,9 @@
//璁惧宸ュ叿鏄庣粏
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
- @PostMapping("/selectDeviceParameter")
- public Result selectDeviceParameter(@RequestBody Map<String, Object> data, @RequestParam(value = "laboratoryNameIsNull", required = false) Boolean laboratoryNameIsNull) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
- return Result.success(deviceService.selectDeviceParameter(page, itemParameter, laboratoryNameIsNull));
+ @GetMapping("/selectDeviceParameter")
+ public Result selectDeviceParameter(Page page,DeviceDto deviceDto,Boolean laboratoryNameIsNull) {
+ return Result.success(deviceService.selectDeviceParameter(page, deviceDto, laboratoryNameIsNull));
}
@ApiOperation(value = "娣诲姞璁惧璇︽儏鍙傛暟")
@@ -92,7 +90,7 @@
}
@ApiOperation(value = "鍒犻櫎璁惧璇︽儏鍙傛暟")
- @PostMapping("/delDeviceParameter")
+ @DeleteMapping("/delDeviceParameter")
public Result<?> delDeviceParameter(Integer id) {
return Result.success(deviceService.delDeviceParameter(id));
}
--
Gitblit v1.9.3