From 259b893309f8c06a22adc8455f44bcc486d796c7 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 30 Jul 2024 09:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 78 +++++++++++++--------------------------
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java | 5 +-
src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java | 4 +-
src/main/java/com/dji/sample/media/service/IFileService.java | 2
src/main/java/com/dji/sample/speak/service/SpeakVoiceService.java | 2
src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java | 4 +-
6 files changed, 35 insertions(+), 60 deletions(-)
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 b6e6b48..1a102fa 100644
--- a/src/main/java/com/dji/sample/media/service/IFileService.java
+++ b/src/main/java/com/dji/sample/media/service/IFileService.java
@@ -39,7 +39,7 @@
Integer saveFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
void saveNailFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
- void saveZipFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
+// void saveZipFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
void updateNailMediaFileNames(String jobId);
PaginationData<MediaFileEntity> getJobId( int pageNum, int pageSize,String workspaceId);
PaginationData<MediaFileEntity> getPhotoByJobId(int page,int pageSize ,String workspaceId,String jobId);
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 757a713..0d89bc5 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
@@ -151,31 +151,31 @@
}
}
- public void saveZipFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
- updateStatue(file.getName());
- boolean endsWith = file.getObjectKey().endsWith(".mp4");
- if (endsWith) {
- MediaFileZipEntity nailEntity = this.fileUploadConvertToZipEntity((file));
- nailEntity.setWorkspaceId(workspaceId);
- nailEntity.setFileId(UUID.randomUUID().toString());
- zipMapper.insert(nailEntity);
- } else {
- String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
- File file1 = TbFjServiceImpl.downloadFile(url);
- File nailFile = new File(ImgZipUtil.compressImageAndGetFile(file1, 0.5f).toURI());
- MediaFileZipEntity zipEntity = this.fileUploadConvertToZipEntity(file);
- zipEntity.setIsOriginal(false);
- zipEntity.setWorkspaceId(workspaceId);
- zipEntity.setFileName("zip" + file.getName());
- zipEntity.setObjectKey("/zip" + file.getPath() + "/" + file.getName());
- zipEntity.setFilePath("zip" + file.getPath());
- String nailName = zipEntity.getObjectKey();
- zipEntity.setFileId(UUID.randomUUID().toString());
- uploadFile(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), nailName, nailFile, "image/jpeg");
- uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", nailName, nailFile, "image/jpeg");
- zipMapper.insert(zipEntity);
- }
- }
+// public void saveZipFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
+// updateStatue(file.getName());
+// boolean endsWith = file.getObjectKey().endsWith(".mp4");
+// if (endsWith) {
+// MediaFileZipEntity nailEntity = this.fileUploadConvertToZipEntity((file));
+// nailEntity.setWorkspaceId(workspaceId);
+// nailEntity.setFileId(UUID.randomUUID().toString());
+// zipMapper.insert(nailEntity);
+// } else {
+// String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
+// File file1 = TbFjServiceImpl.downloadFile(url);
+// File nailFile = new File(ImgZipUtil.compressImageAndGetFile(file1, 0.5f).toURI());
+// MediaFileZipEntity zipEntity = this.fileUploadConvertToZipEntity(file);
+// zipEntity.setIsOriginal(false);
+// zipEntity.setWorkspaceId(workspaceId);
+// zipEntity.setFileName("zip" + file.getName());
+// zipEntity.setObjectKey("/zip" + file.getPath() + "/" + file.getName());
+// zipEntity.setFilePath("zip" + file.getPath());
+// String nailName = zipEntity.getObjectKey();
+// zipEntity.setFileId(UUID.randomUUID().toString());
+// uploadFile(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), nailName, nailFile, "image/jpeg");
+// uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", nailName, nailFile, "image/jpeg");
+// zipMapper.insert(zipEntity);
+// }
+// }
public void updateStatue(String filename) {
if (filename.contains("~")) {
@@ -512,32 +512,6 @@
builder.fileName(file.getName())
.filePath(file.getPath())
.examine(0)
- .fingerprint(file.getFingerprint())
- .objectKey(file.getObjectKey())
- .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
- int[] payloadModel = Arrays.stream(file.getExt().getPayloadModelKey().split("-"))
- .map(Integer::valueOf)
- .mapToInt(Integer::intValue)
- .toArray();
- Optional<DeviceDictionaryDTO> payloadDict = deviceDictionaryService
- .getOneDictionaryInfoByTypeSubType(DeviceDomainEnum.PAYLOAD.getVal(), payloadModel[1], payloadModel[2]);
- payloadDict.ifPresent(payload -> builder.payload(payload.getDeviceName()));
- }
- return builder.build();
- }
-
- private MediaFileMarkEntity fileUploadConvertToMarkEntity(FileUploadDTO file) {
- MediaFileMarkEntity.MediaFileMarkEntityBuilder builder = MediaFileMarkEntity.builder();
-
- if (file != null) {
- builder.fileName(file.getName())
- .filePath(file.getPath())
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
@@ -1077,7 +1051,7 @@
for (MediaFileNailEntity mark : markEntities) {
updateNailMediaFileNames(mark.getJobId());
updateMediaFileNames(mark.getJobId());
- updateMediaZipFileNames(mark.getJobId());
+// updateMediaZipFileNames(mark.getJobId());
}
}
diff --git a/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java b/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
index c8f5bd1..7b2d29c 100644
--- a/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
+++ b/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
@@ -226,9 +226,10 @@
// set path
String objectKey = callback.getFile().getObjectKey();
callback.getFile().setPath(objectKey.substring(objectKey.indexOf("/") + 1, objectKey.lastIndexOf("/")));
+ int count =fileService.saveFile(job.getWorkspaceId(), callback.getFile());
fileService.saveNailFile(job.getWorkspaceId(), callback.getFile());
- fileService.saveZipFile(job.getWorkspaceId(),callback.getFile());
- return fileService.saveFile(job.getWorkspaceId(), callback.getFile()) > 0;
+// fileService.saveZipFile(job.getWorkspaceId(),callback.getFile());
+ return count > 0;
}
/**
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 a3b93d8..9663628 100644
--- a/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
+++ b/src/main/java/com/dji/sample/speak/controller/SpeakVoiceController.java
@@ -57,8 +57,8 @@
}
@PostMapping("/putVoice")
- public ResponseResult putVoice() {
- return ResponseResult.success(voiceServicel.awayRiver());
+ public ResponseResult putVoice(@RequestParam String sn) {
+ return ResponseResult.success(voiceServicel.awayRiver(sn));
}
@GetMapping("/selectVoice")
diff --git a/src/main/java/com/dji/sample/speak/service/SpeakVoiceService.java b/src/main/java/com/dji/sample/speak/service/SpeakVoiceService.java
index 5ba41e6..5fef21a 100644
--- a/src/main/java/com/dji/sample/speak/service/SpeakVoiceService.java
+++ b/src/main/java/com/dji/sample/speak/service/SpeakVoiceService.java
@@ -26,7 +26,7 @@
int setVoiceVolume(SpeakVolumeDto dto,String sn);
- int awayRiver ();
+ int awayRiver (String sn);
PaginationData<SpeakVoiceEntity> getVoices(Integer pages,Integer page_size);
}
diff --git a/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java b/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java
index 16d2352..f34049a 100644
--- a/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java
+++ b/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java
@@ -89,7 +89,7 @@
}
@Override
- public int awayRiver() {
+ public int awayRiver(String sn) {
SpeakVoiceStartDto dto = new SpeakVoiceStartDto();
SpeakVoiceFileDto fileDto = new SpeakVoiceFileDto();
fileDto.setUrl("http://dev.jxpskj.com:9000/cloud-bucket/请远离河道07151604");
@@ -98,7 +98,7 @@
fileDto.setName("河道危险");
dto.setPsdk_index(2);
dto.setFile(fileDto);
- return messageSenderService.publishServicesTopic("7CTDM5E00BR787", VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
+ return messageSenderService.publishServicesTopic(sn, VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
}
@Override
--
Gitblit v1.9.3