From 0830f6724578925ac2279fbfae2966b0bb88b027 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 26 四月 2024 21:59:51 +0800
Subject: [PATCH] 标准库刷新检验项目
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 d4ca573..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
@@ -4,6 +4,7 @@
import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -40,7 +41,7 @@
@PostMapping("/selectDeviceParameter")
public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- Device itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Device.class);
+ DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
}
@@ -117,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