【功能修改】IoT：完善设备详情的属性展示

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDevicePropertyController.java

@@ -6,7 +6,6 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyHistoryPageReqVO;
 import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyRespVO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
@@ -79,10 +78,8 @@ public class IotDevicePropertyController {
             }
             // 构建对象
             IotDevicePropertyDO property = entry.getValue();
-            return BeanUtils.toBean(thingModel, IotDevicePropertyRespVO.class)
-                    .setDataType(thingModel.getProperty().getDataType())
-                    .setValue(property.getValue())
-                    .setUpdateTime(LocalDateTimeUtil.toEpochMilli(property.getUpdateTime()));
+            return new IotDevicePropertyRespVO().setProperty(thingModel.getProperty())
+                    .setValue(property.getValue()).setUpdateTime(LocalDateTimeUtil.toEpochMilli(property.getUpdateTime()));
         }));
     }
 

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.iot.controller.admin.device.vo.data;
 
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -7,8 +8,8 @@ import lombok.Data;
 @Data
 public class IotDevicePropertyRespVO {
 
-    @Schema(description = "属性标识符", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String identifier;
+    @Schema(description = "属性定义", requiredMode = Schema.RequiredMode.REQUIRED)
+    private ThingModelProperty property;
 
     @Schema(description = "最新值", requiredMode = Schema.RequiredMode.REQUIRED)
     private Object value;
@@ -16,12 +17,4 @@ public class IotDevicePropertyRespVO {
     @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long updateTime; // 由于从 TDengine 查询出来的是 Long 类型，所以这里也使用 Long 类型
 
-    // ========== 基于 ThingModel 查询 ==========
-
-    @Schema(description = "属性名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String name;
-
-    @Schema(description = "数据类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String dataType;
-
 }