From 9fbfb954891795ba319c087648e176eedebb4ef1 Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Tue, 20 Jan 2026 17:10:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceModelAttributeController.java | 10 ++++---- .../vo/DeviceModelAttributeRespVO.java | 2 +- .../DeviceModelAttributeService.java | 2 +- .../DeviceModelAttributeServiceImpl.java | 23 +++++++++++++++++-- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/DeviceModelAttributeController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/DeviceModelAttributeController.java index a7b0bd6057..453cefd11e 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/DeviceModelAttributeController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/DeviceModelAttributeController.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.iot.controller.admin.devicemodelattribute; +import cn.iocoder.yudao.module.iot.dal.dataobject.deviceattributetype.DeviceAttributeTypeDO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -81,8 +82,8 @@ public class DeviceModelAttributeController { @Operation(summary = "获得采集设备模型-点位管理分页") @PreAuthorize("@ss.hasPermission('iot:device-model-attribute:query')") public CommonResult> getDeviceModelAttributePage(@Valid DeviceModelAttributePageReqVO pageReqVO) { - PageResult pageResult = deviceModelAttributeService.getDeviceModelAttributePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, DeviceModelAttributeRespVO.class)); + PageResult pageResult = deviceModelAttributeService.getDeviceModelAttributePage(pageReqVO); + return success(pageResult); } @GetMapping("/export-excel") @@ -92,10 +93,9 @@ public class DeviceModelAttributeController { public void exportDeviceModelAttributeExcel(@Valid DeviceModelAttributePageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = deviceModelAttributeService.getDeviceModelAttributePage(pageReqVO).getList(); + List list = deviceModelAttributeService.getDeviceModelAttributePage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "采集设备模型-点位管理.xls", "数据", DeviceModelAttributeRespVO.class, - BeanUtils.toBean(list, DeviceModelAttributeRespVO.class)); + ExcelUtils.write(response, "采集设备模型-点位管理.xls", "数据", DeviceModelAttributeRespVO.class,list); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/vo/DeviceModelAttributeRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/vo/DeviceModelAttributeRespVO.java index 06b4f99ab6..67b0126945 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/vo/DeviceModelAttributeRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/vo/DeviceModelAttributeRespVO.java @@ -27,7 +27,7 @@ public class DeviceModelAttributeRespVO { @Schema(description = "点位类型", example = "1") @ExcelProperty("点位类型") - private String attributeType; + private Long attributeType; @Schema(description = "类型名称", example = "1") @ExcelProperty("类型名称") diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeService.java index d30c4d1eed..e2f867dd60 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeService.java @@ -50,7 +50,7 @@ public interface DeviceModelAttributeService { * @param pageReqVO 分页查询 * @return 采集设备模型-点位管理分页 */ - PageResult getDeviceModelAttributePage(DeviceModelAttributePageReqVO pageReqVO); + PageResult getDeviceModelAttributePage(DeviceModelAttributePageReqVO pageReqVO); List> operationAnalysisDetails(Long deviceId, Long modelId,String collectionStartTime, String collectionEndTime); } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java index 0e71443ec8..5f673ab6ac 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java @@ -49,6 +49,7 @@ public class DeviceModelAttributeServiceImpl implements DeviceModelAttributeServ @Resource private DeviceAttributeTypeMapper deviceAttributeTypeMapper; + @Override public Long createDeviceModelAttribute(DeviceModelAttributeSaveReqVO createReqVO) { // 插入 @@ -90,8 +91,26 @@ public class DeviceModelAttributeServiceImpl implements DeviceModelAttributeServ } @Override - public PageResult getDeviceModelAttributePage(DeviceModelAttributePageReqVO pageReqVO) { - return deviceModelAttributeMapper.selectPage(pageReqVO); + public PageResult getDeviceModelAttributePage(DeviceModelAttributePageReqVO pageReqVO) { + // 1. 获取设备模型属性分页数据 + PageResult pageResult = deviceModelAttributeMapper.selectPage(pageReqVO); + + // 2. 获取所有属性类型并构建映射 + List attributeTypes = deviceAttributeTypeMapper.selectList(); + Map typeNameMap = attributeTypes.stream() + .collect(Collectors.toMap(DeviceAttributeTypeDO::getId, DeviceAttributeTypeDO::getName)); + + // 3. 转换并设置类型名称 + PageResult respPageResult = BeanUtils.toBean(pageResult, DeviceModelAttributeRespVO.class); + + respPageResult.getList().forEach(item -> { + String typeName = typeNameMap.get(item.getAttributeType()); + if (typeName != null) { + item.setTypeName(typeName); + } + }); + + return respPageResult; } @Override