szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
YunaiV 2025-01-29 21:47:34 +08:00
parent 39aaeaa298
commit 911c8c7461
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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