From e476dcb298082dabf0fc17eb75889797bddc91d5 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 18 Jun 2025 19:52:13 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90IoT=20=E7=89=A9=E8=81=94?= =?UTF-8?q?=E7=BD=91=E3=80=91=E8=AE=BE=E5=A4=87=E5=B1=9E=E6=80=A7=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=EF=BC=8C=E4=BB=8E=E5=88=86=E9=A1=B5=E5=8F=98=E6=88=90?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/IotDevicePropertyController.java | 34 +++++-------------- ...=> IotDevicePropertyHistoryListReqVO.java} | 7 ++-- .../dal/tdengine/IotDevicePropertyMapper.java | 5 ++- .../property/IotDevicePropertyService.java | 7 ++-- .../IotDevicePropertyServiceImpl.java | 13 +++---- .../mapper/device/IotDevicePropertyMapper.xml | 5 ++- 6 files changed, 24 insertions(+), 47 deletions(-) rename yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/{IotDevicePropertyHistoryPageReqVO.java => IotDevicePropertyHistoryListReqVO.java} (84%) 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 9447de1847..346117cd7e 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 @@ -3,10 +3,8 @@ package cn.iocoder.yudao.module.iot.controller.admin.device; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.LocalDateTimeUtil; 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.module.iot.controller.admin.device.vo.data.IotDevicePropertyHistoryPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyHistoryListReqVO; 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.IotDevicePropertyDO; @@ -16,7 +14,6 @@ import cn.iocoder.yudao.module.iot.service.device.property.IotDevicePropertyServ import cn.iocoder.yudao.module.iot.service.thingmodel.IotThingModelService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.validation.Valid; @@ -46,18 +43,12 @@ public class IotDevicePropertyController { @Resource private IotDeviceService deviceService; - @GetMapping("/latest") + @GetMapping("/get-latest") @Operation(summary = "获取设备属性最新属性") - @Parameters({ - @Parameter(name = "deviceId", description = "设备编号", required = true), - @Parameter(name = "identifier", description = "标识符"), - @Parameter(name = "name", description = "名称") - }) + @Parameter(name = "deviceId", description = "设备编号", required = true) @PreAuthorize("@ss.hasPermission('iot:device:property-query')") public CommonResult> getLatestDeviceProperties( - @RequestParam("deviceId") Long deviceId, - @RequestParam(value = "identifier", required = false) String identifier, - @RequestParam(value = "name", required = false) String name) { + @RequestParam("deviceId") Long deviceId) { Map properties = devicePropertyService.getLatestDeviceProperties(deviceId); // 拼接数据 @@ -70,12 +61,6 @@ public class IotDevicePropertyController { if (thingModel == null || thingModel.getProperty() == null) { return null; } - if (StrUtil.isNotEmpty(identifier) && !StrUtil.contains(thingModel.getIdentifier(), identifier)) { - return null; - } - if (StrUtil.isNotEmpty(name) && !StrUtil.contains(thingModel.getName(), name)) { - return null; - } // 构建对象 IotDevicePropertyDO property = entry.getValue(); return new IotDevicePropertyRespVO().setProperty(thingModel.getProperty()) @@ -83,13 +68,12 @@ public class IotDevicePropertyController { })); } - @GetMapping("/history-page") - @Operation(summary = "获取设备属性历史数据") + @GetMapping("/history-list") + @Operation(summary = "获取设备属性历史数据列表") @PreAuthorize("@ss.hasPermission('iot:device:property-query')") - public CommonResult> getHistoryDevicePropertyPage( - @Valid IotDevicePropertyHistoryPageReqVO pageReqVO) { - Assert.notEmpty(pageReqVO.getIdentifier(), "标识符不能为空"); - return success(devicePropertyService.getHistoryDevicePropertyPage(pageReqVO)); + public CommonResult> getHistoryDevicePropertyList( + @Valid IotDevicePropertyHistoryListReqVO listReqVO) { + return success(devicePropertyService.getHistoryDevicePropertyList(listReqVO)); } } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyHistoryPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyHistoryListReqVO.java similarity index 84% rename from yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyHistoryPageReqVO.java rename to yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyHistoryListReqVO.java index 38b891309e..52dcec3896 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyHistoryPageReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyHistoryListReqVO.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.iot.controller.admin.device.vo.data; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -12,9 +11,9 @@ import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - IoT 设备属性历史分页 Request VO") +@Schema(description = "管理后台 - IoT 设备属性历史列表 Request VO") @Data -public class IotDevicePropertyHistoryPageReqVO extends PageParam { +public class IotDevicePropertyHistoryListReqVO { @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "177") @NotNull(message = "设备编号不能为空") @@ -29,4 +28,4 @@ public class IotDevicePropertyHistoryPageReqVO extends PageParam { @Size(min = 2, max = 2, message = "请选择时间范围") private LocalDateTime[] times; -} \ No newline at end of file +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/IotDevicePropertyMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/IotDevicePropertyMapper.java index af619cf650..7e26fe0d59 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/IotDevicePropertyMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/IotDevicePropertyMapper.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.iot.dal.tdengine; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyHistoryPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyHistoryListReqVO; 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.framework.tdengine.core.TDengineTableField; @@ -84,7 +84,6 @@ public interface IotDevicePropertyMapper { @Param("properties") Map properties, @Param("reportTime") Long reportTime); - IPage selectPageByHistory(IPage page, - @Param("reqVO") IotDevicePropertyHistoryPageReqVO reqVO); + List selectListByHistory(@Param("reqVO") IotDevicePropertyHistoryListReqVO reqVO); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyService.java index 6f81ec4c9c..1826bd485b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyService.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.iot.service.device.property; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyHistoryPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyHistoryListReqVO; import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyRespVO; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; @@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDevicePropertyDO; import jakarta.validation.Valid; import java.time.LocalDateTime; +import java.util.List; import java.util.Map; import java.util.Set; @@ -47,10 +48,10 @@ public interface IotDevicePropertyService { /** * 获得设备属性历史数据 * - * @param pageReqVO 分页请求 + * @param listReqVO 列表请求 * @return 设备属性历史数据 */ - PageResult getHistoryDevicePropertyPage(@Valid IotDevicePropertyHistoryPageReqVO pageReqVO); + List getHistoryDevicePropertyList(@Valid IotDevicePropertyHistoryListReqVO listReqVO); // ========== 设备时间相关操作 ========== diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java index cbe7a6683b..27731f0375 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java @@ -4,8 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyHistoryPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyHistoryListReqVO; import cn.iocoder.yudao.module.iot.controller.admin.device.vo.data.IotDevicePropertyRespVO; import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType.ThingModelDateOrTextDataSpecs; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; @@ -22,8 +21,6 @@ import cn.iocoder.yudao.module.iot.enums.thingmodel.IotThingModelTypeEnum; import cn.iocoder.yudao.module.iot.framework.tdengine.core.TDengineTableField; import cn.iocoder.yudao.module.iot.service.product.IotProductService; import cn.iocoder.yudao.module.iot.service.thingmodel.IotThingModelService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; @@ -157,14 +154,12 @@ public class IotDevicePropertyServiceImpl implements IotDevicePropertyService { } @Override - public PageResult getHistoryDevicePropertyPage(IotDevicePropertyHistoryPageReqVO pageReqVO) { + public List getHistoryDevicePropertyList(IotDevicePropertyHistoryListReqVO listReqVO) { try { - IPage page = devicePropertyMapper.selectPageByHistory( - new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO); - return new PageResult<>(page.getRecords(), page.getTotal()); + return devicePropertyMapper.selectListByHistory(listReqVO); } catch (Exception exception) { if (exception.getMessage().contains("Table does not exist")) { - return PageResult.empty(); + return Collections.emptyList(); } throw exception; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDevicePropertyMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDevicePropertyMapper.xml index bd58b8c168..ecd78ea429 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDevicePropertyMapper.xml +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDevicePropertyMapper.xml @@ -66,15 +66,14 @@ DESCRIBE product_property_${productId} - - \ No newline at end of file