From 3a0ce6998edc7b78f73e1ed5e3fa3fc82c6a6c2f Mon Sep 17 00:00:00 2001 From: rainv123 <2148537152@qq.com> Date: Fri, 29 May 2026 09:50:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaozhi/modules/device/service/impl/DeviceServiceImpl.java | 3 ++- .../java/xiaozhi/modules/device/vo/UserShowDeviceListVO.java | 3 +++ main/manager-web/src/views/DeviceManagement.vue | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java index e8e82637..2009fa70 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java @@ -303,8 +303,8 @@ public class DeviceServiceImpl extends BaseServiceImpl List devices = getUserDevices(userId, agentId); return devices.stream().map(device -> { UserShowDeviceListVO vo = ConvertUtils.sourceToTarget(device, UserShowDeviceListVO.class); - // 手动设置deviceType（ConvertUtils按字段名匹配，board无法直接映射到deviceType） vo.setDeviceType(device.getBoard()); + vo.setBoard(device.getBoard()); // 设置UTC时间戳供前端使用时区转换 if (device.getLastConnectedAt() != null) { vo.setLastConnectedAtTimestamp(device.getLastConnectedAt().getTime()); @@ -371,6 +371,7 @@ public class DeviceServiceImpl extends BaseServiceImpl sysUserUtilService.assignUsername(device.getUserId(), vo::setBindUserName); vo.setDeviceType(device.getBoard()); + vo.setBoard(device.getBoard()); // 设置UTC时间戳供前端使用时区转换 if (device.getLastConnectedAt() != null) { vo.setLastConnectedAtTimestamp(device.getLastConnectedAt().getTime()); diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/vo/UserShowDeviceListVO.java b/main/manager-api/src/main/java/xiaozhi/modules/device/vo/UserShowDeviceListVO.java index 778f656b..d7035c32 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/device/vo/UserShowDeviceListVO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/device/vo/UserShowDeviceListVO.java @@ -19,6 +19,9 @@ public class UserShowDeviceListVO { @Schema(description = "设备型号") private String deviceType; + @Schema(description = "设备型号(board)") + private String board; + @Schema(description = "设备唯一标识符") private String id; diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue index e15ff278..981365ad 100644 --- a/main/manager-web/src/views/DeviceManagement.vue +++ b/main/manager-web/src/views/DeviceManagement.vue @@ -369,7 +369,7 @@ export default { this.deviceList = data.data.map(device => { return { device_id: device.id, - model: device.deviceType, + model: device.board, firmwareVersion: device.appVersion, macAddress: device.macAddress, bindTime: device.createDate,