From 1ebe2726a5f8fe55f01481b37d1ac1f75a088520 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 16:34:23 +0800
Subject: [PATCH] 2024-4-25 资源要求-设备管理后端调整
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 928eefe..6715974 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));
}
@@ -121,7 +122,7 @@
@PostMapping("/selectDeviceByCategory")
@ValueAuth
@ApiImplicitParams({
- @ApiImplicitParam(name = "category", value = "璁惧鍒嗙被"),
+ @ApiImplicitParam(name = "category", value = "璁惧鍒嗙被", dataTypeClass = String.class),
})
public Result selectDeviceByCategory(String category) {
return Result.success(deviceService.selectDeviceByCategory(category));
--
Gitblit v1.9.3