From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格

---
 src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java |   69 +++++++++++++++++++++-------------
 1 files changed, 43 insertions(+), 26 deletions(-)

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 9a54851..692bad3 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
@@ -59,7 +59,6 @@
     private GetPatchesMapper patchesMapper;
     @Autowired
     private IDeviceDictionaryService deviceDictionaryService;
-
     @Autowired
     private OssServiceContext ossService;
 
@@ -90,37 +89,55 @@
         return mapper.insert(fileEntity);
     }
 
-    public Integer saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException {
-        File file2 = null;
-        MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
-        String url = "http://dev.jxpskj.com:9000/cloud-bucket" + file.getObjectKey();
-        File file1 = TbFjServiceImpl.downloadFile(url);
-        long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
+    public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException {
         boolean endsWith = file.getObjectKey().endsWith(".mp4");
-        if (!endsWith) {
-            file2 = new File(WaterMarkUtil.addWatermark(file1, timestamp, file.getMetadata().getShootPosition().getLat(),
+        if (endsWith) {
+            MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
+            mediaFileMarkEntity.setWorkspaceId(workspaceId);
+            mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
+            markMapper.insert(mediaFileMarkEntity);
+        } else {
+            boolean contains = file.getName().contains("~");
+            if (contains) {
+                String name = TimerUtil.getDkbh(file.getName());
+                List<LotInfo> lotInfos = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getDkbh, name));
+                if (!lotInfos.isEmpty()) {
+                    LambdaUpdateWrapper<LotInfo> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.eq(LotInfo::getDkbh, name)
+                            .eq(LotInfo::getInvestigate, 0)
+                            .set(LotInfo::getInvestigate, 1);
+                    patchesMapper.update(null, updateWrapper);
+                }
+            }
+
+            MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
+            String url = "http://dev.jxpskj.com:9000/cloud-bucket" + file.getObjectKey();
+            File file1 = TbFjServiceImpl.downloadFile(url);
+            long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
+            File file2 = new File(WaterMarkUtil.addWatermark(file1, timestamp, file.getMetadata().getShootPosition().getLat(),
                     file.getMetadata().getShootPosition().getLng(), file.getMetadata().getGimbalYawDegree()).toURI());
+            Object data = ImgUtil.getInfo(file1);
+            mediaFileMarkEntity.setDronedata(data);
+            mediaFileMarkEntity.setWorkspaceId(workspaceId);
+            mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
+            mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
+            mediaFileMarkEntity.setFileName("mark" + file.getName());
+            mediaFileMarkEntity.setFilePath("mark" + file.getPath());
+            String endpoint = "http://dev.jxpskj.com:9000";
+            String accessKey = "pskj";
+            String secretKey = "pskj@2021";
+            String bucketName = "cloud-bucket";
+            String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
+            uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2);
+            markMapper.insert(mediaFileMarkEntity);
         }
-        Object data = ImgUtil.getInfo(file1);
-        mediaFileMarkEntity.setDronedata(data);
-        mediaFileMarkEntity.setWorkspaceId(workspaceId);
-        mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
-        mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
-        mediaFileMarkEntity.setFileName("mark" + file.getName());
-        mediaFileMarkEntity.setFilePath("mark" + file.getPath());
-        String endpoint = "http://dev.jxpskj.com:9000";
-        String accessKey = "pskj";
-        String secretKey = "pskj@2021";
-        String bucketName = "cloud-bucket";
-        String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
-        uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2);
-        return markMapper.insert(mediaFileMarkEntity);
     }
 
     @Override
-    public Object mediaInfo(String fileId) {
+    public Object mediaInfo(String filename) {
+        String name = "mark" + filename;
         MediaFileMarkEntity entity = markMapper.selectOne(new LambdaQueryWrapper<MediaFileMarkEntity>()
-                .eq(MediaFileMarkEntity::getFileId, fileId));
+                .eq(MediaFileMarkEntity::getFileName, name));
         return entity.getDronedata();
     }
 
@@ -140,7 +157,7 @@
     }
 
     public List<MediaFileEntity> listByIsadd(String dkbh, String workspaceId) {
-        return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>().eq(MediaFileEntity::getIsadd, 0)
+        return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
                 .eq(MediaFileEntity::getWorkspaceId, workspaceId)
                 .like(MediaFileEntity::getFileName, dkbh + "~"));
     }

--
Gitblit v1.9.3