From cc7b680aa5b2a6ad599c394715bb4327de8670bf Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 25 Jun 2024 14:37:32 +0800
Subject: [PATCH] 调查取证手动航线更新图斑调查状态，新增媒体查询接口视频图片筛查，调整定时任务时间，新增航线任务错误代码识别
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 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 60e8331..8efa814 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
@@ -64,10 +64,10 @@
new LambdaQueryWrapper<WaylineFileEntity>()
.eq(WaylineFileEntity::getWorkspaceId, workspaceId)
.eq(param.isFavorited(), WaylineFileEntity::getFavorited, param.isFavorited())
- .and(param.getTemplateType() != null, wrapper -> {
- for (Integer type : param.getTemplateType()) {
- wrapper.like(WaylineFileEntity::getTemplateTypes, type).or();
- }
+ .and(param.getTemplateType() != null, wrapper -> {
+ for (Integer type : param.getTemplateType()) {
+ wrapper.like(WaylineFileEntity::getTemplateTypes, type).or();
+ }
})
// There is a risk of SQL injection
.last(StringUtils.hasText(param.getOrderBy()), " order by " + param.getOrderBy()));
@@ -82,13 +82,20 @@
}
@Override
+ public String getPatchesId(String waylineId) {
+ WaylineFileEntity entity = mapper.selectOne(new LambdaQueryWrapper<WaylineFileEntity>()
+ .eq(WaylineFileEntity::getWaylineId, waylineId));
+ return entity.getPatchesId();
+ }
+
+ @Override
public Optional<WaylineFileDTO> getWaylineByWaylineId(String workspaceId, String waylineId) {
return Optional.ofNullable(
this.entityConvertToDTO(
mapper.selectOne(
new LambdaQueryWrapper<WaylineFileEntity>()
- .eq(WaylineFileEntity::getWorkspaceId, workspaceId)
- .eq(WaylineFileEntity::getWaylineId, waylineId))));
+ .eq(WaylineFileEntity::getWorkspaceId, workspaceId)
+ .eq(WaylineFileEntity::getWaylineId, waylineId))));
}
@Override
@@ -160,8 +167,8 @@
@Override
public List<String> getDuplicateNames(String workspaceId, List<String> names) {
return mapper.selectList(new LambdaQueryWrapper<WaylineFileEntity>()
- .eq(WaylineFileEntity::getWorkspaceId, workspaceId)
- .in(WaylineFileEntity::getName, names))
+ .eq(WaylineFileEntity::getWorkspaceId, workspaceId)
+ .in(WaylineFileEntity::getName, names))
.stream()
.map(WaylineFileEntity::getName)
.collect(Collectors.toList());
@@ -175,8 +182,8 @@
}
WaylineFileDTO wayline = waylineOpt.get();
boolean isDel = mapper.delete(new LambdaUpdateWrapper<WaylineFileEntity>()
- .eq(WaylineFileEntity::getWorkspaceId, workspaceId)
- .eq(WaylineFileEntity::getWaylineId, waylineId))
+ .eq(WaylineFileEntity::getWorkspaceId, workspaceId)
+ .eq(WaylineFileEntity::getWaylineId, waylineId))
> 0;
if (!isDel) {
return false;
@@ -185,7 +192,7 @@
}
@Override
- public void importKmzFile(MultipartFile file, String workspaceId, String creator,String patchesId) {
+ public void importKmzFile(MultipartFile file, String workspaceId, String creator, String patchesId) {
Optional<WaylineFileDTO> waylineFileOpt = validKmzFile(file);
if (waylineFileOpt.isEmpty()) {
throw new RuntimeException("文件格式错误");
@@ -197,7 +204,7 @@
waylineFile.setUsername(creator);
ossService.putObject(OssConfiguration.bucket, waylineFile.getObjectKey(), file.getInputStream());
- this.saveWaylineFiles(workspaceId, waylineFile,patchesId);
+ this.saveWaylineFiles(workspaceId, waylineFile, patchesId);
} catch (IOException e) {
e.printStackTrace();
}
@@ -205,7 +212,7 @@
@Override
public WaylineFileDTO importKmzFileBack(MultipartFile file, String workspaceId, String creator) {
- WaylineFileDTO waylineFile=null;
+ WaylineFileDTO waylineFile = null;
Optional<WaylineFileDTO> waylineFileOpt = validKmzFile(file);
if (waylineFileOpt.isEmpty()) {
throw new RuntimeException("文件格式错误");
@@ -227,18 +234,18 @@
@Override
public WaylineFileEntity selectByName(String name) {
- return mapper.selectOne(new LambdaQueryWrapper<WaylineFileEntity>().eq(WaylineFileEntity::getName,name));
+ return mapper.selectOne(new LambdaQueryWrapper<WaylineFileEntity>().eq(WaylineFileEntity::getName, name));
}
@Override
- public List<WaylineListDTO> waylineList(String workspaceId,String droneName) {
+ 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);
+ if (StringUtils.hasText(droneName)) {
+ wrapper.like(WaylineFileEntity::getName, droneName);
}
- return wrapper.list().stream().map(r -> WaylineListDTO.builder().waylineFileId(r.getWaylineId()).name(r.getName()).build())
+ return wrapper.list().stream().map(r -> WaylineListDTO.builder().waylineFileId(r.getWaylineId()).name(r.getName()).build())
.collect(Collectors.toList());
}
@@ -282,7 +289,7 @@
return Optional.of(WaylineFileDTO.builder()
.droneModelKey(String.format("%s-%s-%s", DeviceDomainEnum.SUB_DEVICE.getVal(), type, subType))
- .payloadModelKeys(List.of(String.format("%s-%s-%s",DeviceDomainEnum.PAYLOAD.getVal(), payloadType, payloadSubType)))
+ .payloadModelKeys(List.of(String.format("%s-%s-%s", DeviceDomainEnum.PAYLOAD.getVal(), payloadType, payloadSubType)))
// .objectKey(OssConfiguration.objectDirPrefix + File.separator + filename)
.objectKey(OssConfiguration.objectDirPrefix + "/" + filename)
.name(filename.substring(0, filename.lastIndexOf(WAYLINE_FILE_SUFFIX)))
@@ -296,8 +303,10 @@
}
return Optional.empty();
}
+
/**
* Convert database entity objects into wayline data transfer object.
+ *
* @param entity
* @return
*/
@@ -326,6 +335,7 @@
/**
* Convert the received wayline object into a database entity object.
+ *
* @param file
* @return
*/
@@ -350,9 +360,10 @@
return builder.build();
}
+
@Override
public int updateWayline(WaylineFileEntity entity) {
- return mapper.update(entity,new LambdaQueryWrapper<WaylineFileEntity>()
- .eq(WaylineFileEntity::getWaylineId,entity.getWaylineId()));
+ return mapper.update(entity, new LambdaQueryWrapper<WaylineFileEntity>()
+ .eq(WaylineFileEntity::getWaylineId, entity.getWaylineId()));
}
}
--
Gitblit v1.9.3