From baadf3c1fea323ea32d6508e56a368d1bf54ca87 Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Wed, 4 Feb 2026 11:34:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BC=98=E5=8C=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=91=8A=E8=AD=A6=E9=A1=B5=E9=9D=A2=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/controller/admin/device/DeviceController.java | 10 ++++++++++ .../devicepointrules/DevicePointRulesController.java | 9 +++++++++ .../yudao/module/iot/service/device/DeviceService.java | 2 ++ .../module/iot/service/device/DeviceServiceImpl.java | 7 +++++++ .../devicepointrules/DevicePointRulesService.java | 1 + .../devicepointrules/DevicePointRulesServiceImpl.java | 7 +++++++ 6 files changed, 36 insertions(+) diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java index 77feb66b4e..6b81da1852 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java @@ -214,6 +214,16 @@ public class DeviceController { return success(deviceService.getDeviceAttributePage(pageParam, deviceModelAttributePageReqVO)); } + + @GetMapping("/device-attribute/list") + @Operation(summary = "获得设备属性列表") + @Parameter(name = "deviceId", description = "设备id") + @PreAuthorize("@ss.hasPermission('iot:device:query')") + public CommonResult> getDeviceAttributeList(@RequestParam(name = "deviceId") Long deviceId) { + return success(deviceService.getDeviceAttributeList(deviceId)); + } + + @PostMapping("/device-attribute/create") @Operation(summary = "创建设备属性") @PreAuthorize("@ss.hasPermission('iot:device:create')") diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicepointrules/DevicePointRulesController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicepointrules/DevicePointRulesController.java index 1debf70962..6077d9ebd2 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicepointrules/DevicePointRulesController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicepointrules/DevicePointRulesController.java @@ -104,4 +104,13 @@ public class DevicePointRulesController { BeanUtils.toBean(list, DevicePointRulesRespVO.class)); } + @GetMapping("/getList") + @Operation(summary = "获得点位规则列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('iot:device-point-rules:query')") + public CommonResult> getList(@RequestParam("id") Long id) { + List devicePointRules = devicePointRulesService.getList(id); + return success(devicePointRules); + } + } \ 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/device/DeviceService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceService.java index 7589d79b4e..c7267219b2 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceService.java @@ -136,4 +136,6 @@ public interface DeviceService { DeviceOperationStatusRespVO getDeviceOperationalStatus(); List> getMultiDeviceAttributes(String deviceIds); + + List getDeviceAttributeList(Long deviceId); } \ 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/device/DeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java index 9efc6a5529..4f15ac6780 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java @@ -975,4 +975,11 @@ public class DeviceServiceImpl implements DeviceService { return result; } + + @Override + public List getDeviceAttributeList(Long deviceId) { + return deviceContactModelMapper.selectList(Wrappers.lambdaQuery() + .eq(DeviceContactModelDO::getDeviceId,deviceId) + .orderByDesc(DeviceContactModelDO::getId)); + } } \ 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/devicepointrules/DevicePointRulesService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicepointrules/DevicePointRulesService.java index 234c166159..ed1db9f5c4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicepointrules/DevicePointRulesService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicepointrules/DevicePointRulesService.java @@ -52,4 +52,5 @@ public interface DevicePointRulesService { */ PageResult getDevicePointRulesPage(DevicePointRulesPageReqVO pageReqVO); + List getList(Long id); } \ 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/devicepointrules/DevicePointRulesServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicepointrules/DevicePointRulesServiceImpl.java index 40e0a0d9da..6e5f86f6ee 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicepointrules/DevicePointRulesServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicepointrules/DevicePointRulesServiceImpl.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.iot.service.devicepointrules; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -78,4 +79,10 @@ public class DevicePointRulesServiceImpl implements DevicePointRulesService { return devicePointRulesMapper.selectPage(pageReqVO); } + @Override + public List getList(Long id) { + return devicePointRulesMapper.selectList(Wrappers.lambdaQuery() + .eq(DevicePointRulesDO::getDeviceId,id).eq(DevicePointRulesDO::getIdentifier,"ALARM").orderByDesc(DevicePointRulesDO::getDeviceId)); + } + } \ No newline at end of file