From ddf364ed076204206fbba47f2947b30cbbd21ecb Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 31 Oct 2025 16:16:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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 7466075..fc5dd06 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
@@ -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;
@@ -264,7 +266,7 @@
/**
* 发布状态回复消息
*
- * @param sn 序列号
+ * @param sn 序列号
* @param response 通用主题响应对象
*/
@Override
@@ -312,7 +314,7 @@
/**
* 设备列表
- * */
+ */
@Override
public List<DeviceDTO> getDevicesTopoForWeb() {
List<DeviceDTO> devicesList = this.getDevicesByParams(
@@ -542,7 +544,7 @@
return Optional.of(deviceEntity);
}
// 2025-10-20 zwy 添加时增加授权验证及数量限制，限制为3台机场设备，超出则抛出异常
- try{
+ try {
// 查询数据库中机器设备数量
// 根据参数获取设备列表
List<DeviceDTO> devicesList = this.getDevicesByParams(
@@ -552,8 +554,7 @@
.build());
// 验证授权数量
validateAuthorization(devicesList.size(), 1);
- }
- catch (Exception e) {
+ } catch (Exception e) {
return Optional.empty();
}
// 调用验证方法
@@ -863,9 +864,9 @@
/**
* 根据域名分页获取已绑定的设备信息
*
- * @param page 当前页码
- * @param pageSize 每页显示数量
- * @param domain 域名
+ * @param page 当前页码
+ * @param pageSize 每页显示数量
+ * @param domain 域名
* @return PaginationData<DeviceDTO> 包含分页信息的设备DTO列表
*/
@Override
@@ -1186,7 +1187,7 @@
* 处理获取机场组织信息的请求
*
* @param receiver 接收到的消息
- * @param headers 消息头
+ * @param headers 消息头
*/
@ServiceActivator(inputChannel = ChannelName.INBOUND_REQUESTS_AIRPORT_ORGANIZATION_GET, outputChannel =
ChannelName.OUTBOUND)
@@ -1195,10 +1196,10 @@
OrganizationGetReceiver.class);
CommonTopicResponse.CommonTopicResponseBuilder<RequestsReply> builder =
CommonTopicResponse.<RequestsReply>builder()
- .tid(receiver.getTid())
- .bid(receiver.getBid())
- .method(RequestsMethodEnum.AIRPORT_ORGANIZATION_GET.getMethod())
- .timestamp(System.currentTimeMillis());
+ .tid(receiver.getTid())
+ .bid(receiver.getBid())
+ .method(RequestsMethodEnum.AIRPORT_ORGANIZATION_GET.getMethod())
+ .timestamp(System.currentTimeMillis());
String topic = headers.get(MqttHeaders.RECEIVED_TOPIC).toString() + TopicConst._REPLY_SUF;
@@ -1219,4 +1220,10 @@
messageSender.publish(topic, builder.build());
}
+
+ @DataScopePlus(deptAlias="d")
+ @Override
+ public List<DeviceEntity> selectList(Wrapper<DeviceEntity> queryWrapper) {
+ return mapper.selectList(queryWrapper);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3