From fa7479cd93d2b87c3a62a7c954c1833df34f3f0c Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 03 Aug 2024 17:50:00 +0800
Subject: [PATCH] 国土调查注册对接，完成注册接口，完成SM2和SM4加密解密方法
---
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
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 4d570b1..648305a 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
@@ -89,7 +89,7 @@
}
@Override
- public Integer saveMediaFile(String workspaceId, FileUploadDTO file) throws ImageProcessingException, IOException {
+ public Integer saveMediaFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
return fileService.saveFile(workspaceId, file);
}
@@ -218,7 +218,7 @@
BizCodeEnum.FILE_UPLOAD_CALLBACK.getCode(), mediaFileCount);
}
- private Boolean parseMediaFile(FileUploadCallback callback, WaylineJobDTO job) throws IOException, FontFormatException, ImageProcessingException {
+ private Boolean parseMediaFile(FileUploadCallback callback, WaylineJobDTO job) throws ImageProcessingException, IOException, FontFormatException {
// Set the drone sn that shoots the media
Optional<DeviceDTO> dockDTO = deviceService.getDeviceBySn(job.getDockSn());
dockDTO.ifPresent(dock -> callback.getFile().getExt().setSn(dock.getChildDeviceSn()));
@@ -226,23 +226,10 @@
// set path
String objectKey = callback.getFile().getObjectKey();
callback.getFile().setPath(objectKey.substring(objectKey.indexOf("/") + 1, objectKey.lastIndexOf("/")));
- try {
- ExecutorService executor = Executors.newSingleThreadExecutor();
- executor.execute(() -> {
- try {
- fileService.saveMarkFile(job.getWorkspaceId(), callback.getFile());
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- });
- executor.shutdown();
- } catch (Exception e) {
- log.error("方法执行有误==============: ", e);
- throw e;
- }
-
-
- return fileService.saveFile(job.getWorkspaceId(), callback.getFile()) > 0;
+ int count =fileService.saveFile(job.getWorkspaceId(), callback.getFile());
+// fileService.saveFiles(job.getWorkspaceId(), callback.getFile());
+// fileService.saveZipFile(job.getWorkspaceId(),callback.getFile());
+ return count > 0;
}
/**
--
Gitblit v1.9.3