Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-31 ddf364ed076204206fbba47f2947b30cbbd21ecb

 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java

@@ -1,7 +1,9 @@
package com.ard.sample.manage.service.impl;

import com.alibaba.fastjson2.JSONObject;
import com.ard.common.annotation.DataScopePlus;
import com.ard.system.authorize.service.AuthorizeService;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -312,7 +314,7 @@

    /**
     * 设备列表
     * */
     */
    @Override
    public List<DeviceDTO> getDevicesTopoForWeb() {
        List<DeviceDTO> devicesList = this.getDevicesByParams(
@@ -552,8 +554,7 @@
                            .build());
            // 验证授权数量
            validateAuthorization(devicesList.size(), 1);
        }
        catch (Exception e) {
        } catch (Exception e) {
            return Optional.empty();
        }
        // 调用验证方法
@@ -1219,4 +1220,10 @@

        messageSender.publish(topic, builder.build());
    }

    @DataScopePlus(deptAlias="d")
    @Override
    public List<DeviceEntity> selectList(Wrapper<DeviceEntity> queryWrapper) {
        return mapper.selectList(queryWrapper);
    }
}