From 1fd15505dc8bc4335f6cb9c1a0fc3e4b687b1ac0 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 01 Nov 2025 12:40:45 +0800
Subject: [PATCH] 2025-11-1 zwy 整理代码增加注释，做权限验证的设备列表为mapper中单独写的一个自定义方法
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
index 816c596..02ea292 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
@@ -351,6 +351,7 @@
// subDevice.setPayloadsList(payloadService.getDevicePayloadEntitiesByDeviceSn(gateway.getChildDeviceSn()));
}
+ //region 单独写一个方法做权限验证，由于有好多定时任务也在实时获取设备列表，原方法不适用再添加权限注解
@Override
public List<DeviceDTO> getDockList() {
List<DeviceDTO> devicesList = this.getDockListByParams(
@@ -368,27 +369,21 @@
@Override
public void spliceDeviceTopoPer(DeviceDTO gateway) {
-
gateway.setStatus(RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + gateway.getDeviceSn()));
-
// sub device
if (!StringUtils.hasText(gateway.getChildDeviceSn())) {
return;
}
-
DeviceDTO subDevice =
getDevicesByParams(DeviceQueryParam.builder().deviceSn(gateway.getChildDeviceSn()).build()).get(0);
subDevice.setStatus(RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + subDevice.getDeviceSn()));
gateway.setChildren(subDevice);
-
- // payloads
- // subDevice.setPayloadsList(payloadService.getDevicePayloadEntitiesByDeviceSn(gateway.getChildDeviceSn()));
}
- //@DataScope(deptAlias = "d")
+
@Override
public List<DeviceDTO> getDockListByParams(DeviceQueryParam param){
-
+ // 在mapper中添加查询方法做权限验证
return mapper.selectListPer(
new LambdaQueryWrapper<DeviceEntity>()
.eq(StringUtils.hasText(param.getDeviceSn()),
@@ -412,6 +407,7 @@
.map(this::deviceEntityConvertToDTO)
.collect(Collectors.toList());
}
+ //endregion
@Override
public Optional<TopologyDeviceDTO> getDeviceTopoForPilot(String sn) {
--
Gitblit v1.9.3