From 94a6e4e4bc39153e64f8599e626475c4ce5bdb88 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 16 Jul 2024 13:49:01 +0800
Subject: [PATCH] 修改喊话功能的重新喊话和音频展示接口，新增缩略图展示接口
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 67 ++++++++++++++++++++++
src/main/java/com/dji/sample/media/model/MediaFileNailEntity.java | 8 ++
src/main/java/com/dji/sample/media/controller/FileController.java | 17 +++++
src/main/java/com/dji/sample/media/service/IFileService.java | 9 +-
src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java | 26 ++++----
5 files changed, 108 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/controller/FileController.java b/src/main/java/com/dji/sample/media/controller/FileController.java
index 4fdd5cd..89feb4d 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -91,7 +91,22 @@
@RequestParam(required = false) String type
) {
- return ResponseResult.success(fileService.MediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
+ return ResponseResult.success(fileService.mediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
+
+ }
+ @GetMapping("nailDataShow/{workspace_id}")
+ public ResponseResult getNailMeidaData(@PathVariable(name = "workspace_id") String workspaceId,
+ @RequestParam Integer page,
+ @RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
+ @RequestParam(name = "photoStart", required = false) Long updateStart,
+ @RequestParam(name = "photoEnd", required = false) Long updateEnd,
+ @RequestParam(name = "updateStart", required = false) Long photoStart,
+ @RequestParam(name = "updateEnd", required = false) Long photoEnd,
+ @RequestParam(name = "jobName", required = false) String jobName,
+ @RequestParam(required = false) String type
+ ) {
+
+ return ResponseResult.success(fileService.mediaNailQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
}
diff --git a/src/main/java/com/dji/sample/media/model/MediaFileNailEntity.java b/src/main/java/com/dji/sample/media/model/MediaFileNailEntity.java
index 983059b..63940e1 100644
--- a/src/main/java/com/dji/sample/media/model/MediaFileNailEntity.java
+++ b/src/main/java/com/dji/sample/media/model/MediaFileNailEntity.java
@@ -61,4 +61,12 @@
@TableField("user_id")
private String userId;
+ @TableField("drone")
+ private String drone;
+
+ @TableField(value = "metadata", typeHandler = FastjsonTypeHandler.class)
+ private Object metadata;
+
+ @TableField("job_name")
+ private String jobName;
}
diff --git a/src/main/java/com/dji/sample/media/service/IFileService.java b/src/main/java/com/dji/sample/media/service/IFileService.java
index 66b9e8e..0226017 100644
--- a/src/main/java/com/dji/sample/media/service/IFileService.java
+++ b/src/main/java/com/dji/sample/media/service/IFileService.java
@@ -3,10 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
-import com.dji.sample.media.model.FileUploadDTO;
-import com.dji.sample.media.model.MediaFileDTO;
-import com.dji.sample.media.model.MediaFileEntity;
-import com.dji.sample.media.model.MediaFileQueryParam;
+import com.dji.sample.media.model.*;
import com.drew.imaging.ImageProcessingException;
import java.awt.*;
@@ -63,7 +60,9 @@
*/
List<MediaFileDTO> getAllFilesByWorkspaceId(String workspaceId);
- PaginationData<MediaFileEntity> MediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName,String worksapceId,String isVedio);
+ PaginationData<MediaFileEntity> mediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName,String worksapceId,String isVedio);
+
+ PaginationData<MediaFileNailEntity> mediaNailQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type);
/**
* 获取图斑图片集合
* @param dkbh
diff --git a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
index 81ad2af..27fdcb0 100644
--- a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
+++ b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
@@ -200,7 +200,7 @@
}
@Override
- public PaginationData<MediaFileEntity> MediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type) {
+ public PaginationData<MediaFileEntity> mediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type) {
// 创建查询条件对象
LambdaQueryWrapper<MediaFileEntity> queryWrapper = new LambdaQueryWrapper<>();
@@ -256,6 +256,70 @@
// 创建临时的 Page 对象
Page<MediaFileEntity> resultPage = new Page<>(page, pageSize);
+ resultPage.setRecords(pageResults);
+ resultPage.setTotal(total);
+
+ // 返回分页数据
+ return new PaginationData<>(pageResults, new Pagination(resultPage));
+ }
+
+ @Override
+ public PaginationData<MediaFileNailEntity> mediaNailQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type) {
+ // 创建查询条件对象
+ LambdaQueryWrapper<MediaFileNailEntity> queryWrapper = new LambdaQueryWrapper<>();
+
+ // 添加查询条件
+ queryWrapper.eq(MediaFileNailEntity::getWorkspaceId, workspaceId);
+
+ if (updateStart != null && updateEnd != null) {
+ queryWrapper.between(MediaFileNailEntity::getCreateTime, updateStart, updateEnd);
+ }
+
+ if (photoStart != null && photoEnd != null) {
+ queryWrapper.apply("JSON_UNQUOTE(JSON_EXTRACT(metadata, '$.createdTime')) BETWEEN {0} AND {1}", photoStart, photoEnd);
+ }
+
+ if (jobName != null && !jobName.isEmpty()) {
+ List<String> jobIds = waylineJobService.getJobIds(jobName);
+ if (jobIds.isEmpty()) {
+ return new PaginationData<>(Collections.emptyList(), new Pagination(new Page<>(page, pageSize)));
+ }
+ queryWrapper.in(MediaFileNailEntity::getJobId, jobIds);
+ }
+
+ if (type != null && !type.isEmpty()) {
+ if ("图片".equals(type)) {
+ queryWrapper.likeLeft(MediaFileNailEntity::getFileName, ".jpeg");
+ } else if ("视频".equals(type)) {
+ queryWrapper.likeLeft(MediaFileNailEntity::getFileName, ".mp4");
+ }
+ }
+
+ queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
+
+ // 执行查询获取所有结果
+ List<MediaFileNailEntity> allResults = nailMapper.selectList(queryWrapper);
+
+ // 处理结果去重并设置任务名称
+ Map<String, MediaFileNailEntity> uniqueFileMap = new LinkedHashMap<>();
+ List<MediaFileNailEntity> uniqueResults = allResults.stream()
+ .peek(mediaFile -> {
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
+ })
+ .filter(mediaFile -> uniqueFileMap.putIfAbsent(mediaFile.getFileName(), mediaFile) == null)
+ .collect(Collectors.toList());
+
+ // 计算分页信息
+ int total = uniqueResults.size();
+ int start = (page - 1) * pageSize;
+ int end = Math.min(start + pageSize, total);
+
+ // 获取当前页的结果
+ List<MediaFileNailEntity> pageResults = uniqueResults.subList(start, end);
+
+ // 创建临时的 Page 对象
+ Page<MediaFileNailEntity> resultPage = new Page<>(page, pageSize);
resultPage.setRecords(pageResults);
resultPage.setTotal(total);
@@ -436,6 +500,7 @@
.subFileType(file.getSubFileType())
.isOriginal(file.getExt().getIsOriginal())
.jobId(file.getExt().getFlightId())
+ .drone(file.getExt().getSn()).metadata(file.getMetadata())
.tinnyFingerprint(file.getExt().getTinnyFingerprint());
// domain-type-subType
diff --git a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
index 69e88b8..2a764a3 100644
--- a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
+++ b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
@@ -25,14 +25,15 @@
private SpeakVoiceService voiceServicel;
@Autowired
private PatchesConfigPojo patchesConfigPojo;
+
@PostMapping("/startVoice")
public ResponseResult takeVoice(@RequestParam String sn,
@RequestParam int psdk_index,
@RequestParam String name,
@RequestParam Integer volumn,
@RequestParam MultipartFile file) throws UnsupportedAudioFileException, IOException {
- File file1=MultipartFileTOFileUtil.multipartFile2File(file,patchesConfigPojo.getUnzip());
- return ResponseResult.success(voiceServicel.takeVoice(sn, psdk_index,name,file1,volumn));
+ File file1 = MultipartFileTOFileUtil.multipartFile2File(file, patchesConfigPojo.getUnzip());
+ return ResponseResult.success(voiceServicel.takeVoice(sn, psdk_index, name, file1, volumn));
}
@PostMapping("/stopVoice")
@@ -51,16 +52,17 @@
}
@PostMapping("/restartVoice")
- public ResponseResult restartVoice(@RequestParam int psdkIndex, @RequestParam String sn) {
- return ResponseResult.success(voiceServicel.restartVoice(sn, psdkIndex));
- }
- @PostMapping("/putVoice")
- public ResponseResult putVoice (int id){
- return ResponseResult.success(voiceServicel.awayRiver(id));
- }
- @GetMapping("/selectVoice")
- public ResponseResult getVoices(@RequestParam Integer page,@RequestParam Integer page_size ){
- return ResponseResult.success(voiceServicel.getVoices(page,page_size));
+ public ResponseResult restartVoice(@RequestParam int psdk_index, @RequestParam String sn) {
+ return ResponseResult.success(voiceServicel.restartVoice(sn, psdk_index));
}
+ @PostMapping("/putVoice")
+ public ResponseResult putVoice(int id) {
+ return ResponseResult.success(voiceServicel.awayRiver(id));
+ }
+
+ @GetMapping("/selectVoice")
+ public ResponseResult getVoices(@RequestParam Integer page, @RequestParam Integer page_size) {
+ return ResponseResult.success(voiceServicel.getVoices(page, page_size));
+ }
}
--
Gitblit v1.9.3