From cfdaaae8690e188f6971057259873aa408ebc9e3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 16:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 6715974..be6dbe7 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -118,14 +118,18 @@
return Result.success(deviceService.selectDevicePrincipal());
}
- @ApiOperation(value = "閫氳繃璁惧鍒嗙被鑾峰彇璁惧鍒楄〃")
+ @ApiOperation(value = "閫氳繃椤圭洰鑾峰彇璁惧鍒楄〃")
@PostMapping("/selectDeviceByCategory")
@ValueAuth
- @ApiImplicitParams({
- @ApiImplicitParam(name = "category", value = "璁惧鍒嗙被", dataTypeClass = String.class),
- })
- public Result selectDeviceByCategory(String category) {
- return Result.success(deviceService.selectDeviceByCategory(category));
+ public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass) {
+ return Result.success(deviceService.selectDeviceByCategory(inspectionItem, inspectionItemSubclass));
+ }
+
+ @ApiOperation(value = "閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃")
+ @PostMapping("/selectDeviceByCode")
+ @ValueAuth
+ public Result selectDeviceByCode(String code) {
+ return Result.success(deviceService.selectDeviceByCode(code));
}
}
--
Gitblit v1.9.3