From 911c8c74615910f8ce276c61ff10511737b2fec5 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 29 Jan 2025 21:47:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91IoT=EF=BC=9A=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E5=B1=9E=E6=80=A7=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/device/IotDevicePropertyController.java | 7 ++----- .../device/vo/data/IotDevicePropertyRespVO.java | 13 +++---------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDevicePropertyController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDevicePropertyController.java index d8021d2e89..47bf325dda 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDevicePropertyController.java +++ b/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())); })); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyRespVO.java index 3a3fa49026..dd7a0d6ad2 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyRespVO.java +++ b/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; - } \ No newline at end of file