From 24b0b79158fc499f2e2f6b67e169b3b4dff97569 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 23 Mar 2024 16:58:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
index 14fa513..bbeee6f 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
@@ -182,11 +182,15 @@
}
@Override
- public List<WaylineListDTO> waylineList(String workspaceId) {
- return new LambdaQueryChainWrapper<>(mapper).eq(WaylineFileEntity::getWorkspaceId, workspaceId)
- .list().stream().map(r -> WaylineListDTO.builder().waylineFileId(r.getWaylineId()).name(r.getName()).build())
- .collect(Collectors.toList());
+ public List<WaylineListDTO> waylineList(String workspaceId,String droneName) {
+ LambdaQueryChainWrapper<WaylineFileEntity> wrapper =
+ new LambdaQueryChainWrapper<>(mapper).eq(WaylineFileEntity::getWorkspaceId, workspaceId);
+ if (StringUtils.hasText(droneName)){
+ wrapper.like(WaylineFileEntity::getName,droneName);
+ }
+ return wrapper.list().stream().map(r -> WaylineListDTO.builder().waylineFileId(r.getWaylineId()).name(r.getName()).build())
+ .collect(Collectors.toList());
}
private Optional<WaylineFileDTO> validKmzFile(MultipartFile file) {
--
Gitblit v1.9.3