From c1915a7e947710572826a746e975e8d09516a0e7 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 08 Apr 2024 16:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 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..a90846f 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) {
@@ -295,4 +299,9 @@
return builder.build();
}
+ @Override
+ public int updateWayline(WaylineFileEntity entity) {
+ return mapper.update(entity,new LambdaQueryWrapper<WaylineFileEntity>()
+ .eq(WaylineFileEntity::getWaylineId,entity.getWaylineId()));
+ }
}
--
Gitblit v1.9.3