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

rain

2024-04-08 c1915a7e947710572826a746e975e8d09516a0e7

 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()));
    }
}