Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
GeoFlyApi
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GeoFly
GeoFlyApi
Commits
967dc111
Commit
967dc111
authored
Oct 10, 2025
by
gdj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
限制机场集群设备列表查询条件,增加团队限制。
parent
b1751ea3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
40 additions
and
2 deletions
+40
-2
sample/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java
+40
-2
No files found.
sample/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java
View file @
967dc111
...
...
@@ -1483,15 +1483,53 @@ public class DeviceServiceImpl extends ServiceImpl<IDeviceMapper, DeviceEntity>
@Override
public
PaginationData
<
DeviceDTO
>
getDockAndDrone
(
String
workspaceId
,
Long
page
,
Long
pageSize
)
{
LambdaQueryWrapper
<
DeviceEntity
>
wrapper
=
new
LambdaQueryWrapper
<
DeviceEntity
>()
LambdaQueryWrapper
<
DeviceEntity
>
wrapper
=
new
LambdaQueryWrapper
<
DeviceEntity
>();
// 假如是超级管理员 查询全部设备
if
(
aboveSysAdminRole
())
{
.
eq
(
DeviceEntity:
:
getWorkspaceId
,
workspaceId
);
}
else
{
wrapper
.
eq
(
DeviceEntity:
:
getWorkspaceId
,
workspaceId
);
}
// if (StringUtils.hasText(deviceName)) {
// wrapper.like(DeviceEntity::getDeviceName, deviceName);
// }
wrapper
.
in
(
DeviceEntity:
:
getDomain
,
DeviceDomainEnum
.
DOCK
.
getDomain
(),
DeviceDomainEnum
.
DRONE
.
getDomain
());
// 假如不是超级管理员 只能查询自己所属团队的设备
if
(
aboveSysAdminRole
())
{
}
else
{
// 查询自己团队
LambdaQueryWrapper
<
UserOrgEntity
>
userOrgQueryWrapper
=
new
LambdaQueryWrapper
<>();
userOrgQueryWrapper
.
eq
(
UserOrgEntity:
:
getUserId
,
getUserId
());
userOrgQueryWrapper
.
eq
(
UserOrgEntity:
:
getWorkspaceId
,
workspaceId
);
List
<
UserOrgEntity
>
userOrgEntities
=
userOrgService
.
list
(
userOrgQueryWrapper
);
if
(
CollectionUtils
.
isEmpty
(
userOrgEntities
))
{
return
new
PaginationData
<>(
new
ArrayList
<>(),
new
Pagination
(
page
,
pageSize
,
0
));
}
List
<
String
>
userOrgIdList
=
userOrgEntities
.
stream
().
map
(
UserOrgEntity:
:
getOrgId
).
distinct
().
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isEmpty
(
userOrgIdList
))
{
return
new
PaginationData
<>(
new
ArrayList
<>(),
new
Pagination
(
page
,
pageSize
,
0
));
}
// 查询 团队的设备
LambdaQueryWrapper
<
DeviceOrgEntity
>
deviceOrgQueryWrapper
=
new
LambdaQueryWrapper
<>();
deviceOrgQueryWrapper
.
eq
(
DeviceOrgEntity:
:
getWorkspaceId
,
workspaceId
);
deviceOrgQueryWrapper
.
in
(
DeviceOrgEntity:
:
getOrgId
,
userOrgIdList
);
List
<
DeviceOrgEntity
>
deviceOrgEntities
=
deviceOrgService
.
list
(
deviceOrgQueryWrapper
);
if
(
CollectionUtils
.
isEmpty
(
deviceOrgEntities
))
{
return
new
PaginationData
<>(
new
ArrayList
<>(),
new
Pagination
(
page
,
pageSize
,
0
));
}
List
<
String
>
deviceSnList
=
deviceOrgEntities
.
stream
().
map
(
DeviceOrgEntity:
:
getDeviceSn
).
distinct
().
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isEmpty
(
deviceSnList
))
{
return
new
PaginationData
<>(
new
ArrayList
<>(),
new
Pagination
(
page
,
pageSize
,
0
));
}
wrapper
.
in
(
DeviceEntity:
:
getDeviceSn
,
deviceSnList
);
}
Page
<
DeviceEntity
>
pagination
=
mapper
.
selectPage
(
new
Page
<>(
page
,
pageSize
),
wrapper
);
List
<
DeviceDTO
>
devicesList
=
pagination
.
getRecords
().
stream
().
map
(
this
::
deviceEntityConvertToDTO
)
.
peek
(
device
->
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment