From c00662a72ca1582c064a2bd76aa92fd22fbfedc6 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 30 May 2024 13:53:07 +0800
Subject: [PATCH] 修改水印部分信息，添加图斑图片审核，大屏图斑图片添加水印
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 125 ++++++++++++++++++++++++++++-------------
1 files changed, 86 insertions(+), 39 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 24b347e..9fff9b9 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
@@ -1,9 +1,5 @@
package com.dji.sample.media.service.impl;
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.oss.model.PutObjectRequest;
-import com.aliyun.oss.model.PutObjectResult;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
@@ -20,22 +16,24 @@
import com.dji.sample.media.model.*;
import com.dji.sample.media.service.IFileService;
import com.dji.sample.territory.service.impl.TbFjServiceImpl;
+import com.dji.sample.territory.utils.VideoZipUtil;
import com.dji.sample.territory.utils.WaterMarkUtil;
+import io.minio.MinioClient;
+import io.minio.PutObjectArgs;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.awt.*;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.net.URL;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
-import java.util.Arrays;
+import java.util.*;
import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -83,25 +81,38 @@
fileEntity.setFileId(UUID.randomUUID().toString());
return mapper.insert(fileEntity);
}
- public Integer saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException {
- MediaFileMarkEntity mediaFileMarkEntity =this.fileUploadConvertToMarkEntity(file);
- String url = "http://dev.jxpskj.com:9000/cloud-bucket" + file.getObjectKey();
- File file1=TbFjServiceImpl.downloadFile(url);
- File file2= new File(WaterMarkUtil.addWatermark(file1, Long.valueOf(file.getMetadata().getCreatedTime().toString()),file.getMetadata().getPhotoedPosition().getLat(),
- file.getMetadata().getPhotoedPosition().getLng(),file.getMetadata().getGimbalYawDegree()).toURI());
- mediaFileMarkEntity.setObjectKey(file.getPath());
- 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());
- uploadFile(String.valueOf(file2), mediaFileMarkEntity.getObjectKey());
- return markMapper.insert(mediaFileMarkEntity);
+
+ public Integer saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException {
+ 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());
+ boolean endsWith = file.getObjectKey().endsWith(".mp4");
+ if (!endsWith) {
+ file2 = new File(WaterMarkUtil.addWatermark(file1, timestamp, file.getMetadata().getShootPosition().getLat(),
+ file.getMetadata().getShootPosition().getLng(), file.getMetadata().getGimbalYawDegree()).toURI());
+ } else {
+ file2 = VideoZipUtil.compressVideo(file1, 1600000, 128000, 1280, 720);
}
+ 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 List<MediaFileDTO> getAllFilesByWorkspaceId(String workspaceId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getWorkspaceId, workspaceId))
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId))
.stream()
.map(this::entityConvertToDto)
.collect(Collectors.toList());
@@ -110,7 +121,21 @@
@Override
public List<MediaFileEntity> listMediaFileEntity(String workspaceId, String jobId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getWorkspaceId, workspaceId).eq(MediaFileEntity::getJobId,jobId));
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId).eq(MediaFileEntity::getJobId, jobId));
+ }
+
+ public List<MediaFileEntity> listByIsadd() {
+ return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>().eq(MediaFileEntity::getIsadd, 0)
+ .like(MediaFileEntity::getFileName, "~"));
+ }
+
+ public int updateExamByFileId(String fileId) {
+ // 创建并配置 LambdaUpdateWrapper
+ LambdaUpdateWrapper<MediaFileEntity> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(MediaFileEntity::getFileId, fileId)
+ .set(MediaFileEntity::getExamine, 0);
+ // 执行更新操作并返回更新的行数
+ return mapper.update(null, updateWrapper);
}
@Override
@@ -121,7 +146,7 @@
// .eq(MediaFileEntity::getWorkspaceId, workspaceId)
// .orderByDesc(MediaFileEntity::getId));
Page<MediaFileEntity> pageData = mapper.selectPage(new Page<MediaFileEntity>(page, pageSize), new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getWorkspaceId,workspaceId)
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId)
.orderByDesc(MediaFileEntity::getCreateTime));
List<MediaFileEntity> records = pageData.getRecords()
@@ -130,11 +155,12 @@
return new PaginationData<MediaFileEntity>(records, new Pagination(pageData));
}
- public int deleteMedia(String workspaceId, String fileId) {
- int count=mapper.delete(new LambdaUpdateWrapper<MediaFileEntity>().eq(MediaFileEntity::getFileId, fileId)
+ public int deleteMedia(String workspaceId, String fileId) {
+ int count = mapper.delete(new LambdaUpdateWrapper<MediaFileEntity>().eq(MediaFileEntity::getFileId, fileId)
.eq(MediaFileEntity::getWorkspaceId, workspaceId));
- return count;
+ return count;
}
+
@Override
public URL getObjectUrl(String workspaceId, String fileId) {
Optional<MediaFileEntity> mediaFileOpt = getMediaByFileId(workspaceId, fileId);
@@ -148,8 +174,8 @@
@Override
public List<MediaFileDTO> getFilesByWorkspaceAndJobId(String workspaceId, String jobId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getWorkspaceId, workspaceId)
- .eq(MediaFileEntity::getJobId, jobId))
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId)
+ .eq(MediaFileEntity::getJobId, jobId))
.stream()
.map(this::entityConvertToDto).collect(Collectors.toList());
}
@@ -162,8 +188,8 @@
params.setWorkspaceId(mediaFileEntity.getWorkspaceId());*/
boolean update1 = new LambdaUpdateChainWrapper<>(mapper).eq(MediaFileEntity::getFileId, mediaFileEntity.getFileId())
.set(MediaFileEntity::getFileName, mediaFileEntity.getFileName())
- .set(MediaFileEntity::getCollectStatus,mediaFileEntity.getCollectStatus())
- .set(MediaFileEntity::getUserId,mediaFileEntity.getUserId())
+ .set(MediaFileEntity::getCollectStatus, mediaFileEntity.getCollectStatus())
+ .set(MediaFileEntity::getUserId, mediaFileEntity.getUserId())
.update();
// int update = mapper.update(mediaFileEntity, Wrappers.update(params));
return update1;
@@ -171,6 +197,7 @@
/**
* Convert the received file object into a database entity object.
+ *
* @param file
* @return
*/
@@ -181,6 +208,7 @@
builder.fileName(file.getName())
.filePath(file.getPath())
.isadd(0)
+ .examine(1)
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
@@ -200,6 +228,7 @@
}
return builder.build();
}
+
private MediaFileMarkEntity fileUploadConvertToMarkEntity(FileUploadDTO file) {
MediaFileMarkEntity.MediaFileMarkEntityBuilder builder = MediaFileMarkEntity.builder();
@@ -230,6 +259,7 @@
/**
* Convert database entity objects into file data transfer object.
+ *
* @param entity
* @return
*/
@@ -255,16 +285,33 @@
return builder.build();
}
- public void uploadFile(String filePath, String key) {
- OSS ossClient = new OSSClientBuilder().build(OssConfiguration.endpoint, OssConfiguration.accessKey, OssConfiguration.secretKey);
+
+ public static void uploadFile(String endpoint, String accessKey, String secretKey, String bucketName, String objectName, File file) {
try {
- File file = new File(filePath);
- PutObjectRequest putObjectRequest = new PutObjectRequest(OssConfiguration.bucket, key, file);
- PutObjectResult putObjectResult = ossClient.putObject(putObjectRequest);
+ // 创建MinIO客户端实例
+ MinioClient minioClient = MinioClient.builder()
+ .endpoint(endpoint)
+ .credentials(accessKey, secretKey)
+ .build();
+ // 上传文件
+ FileInputStream fileInputStream = new FileInputStream(file);
+ minioClient.putObject(
+ PutObjectArgs.builder()
+ .bucket(bucketName)
+ .object(objectName)
+ .stream(fileInputStream, file.length(), -1)
+ .build()
+ );
+ fileInputStream.close();
} catch (Exception e) {
- e.printStackTrace();
- } finally {
- ossClient.shutdown();
+ throw new RuntimeException("上传文件至服务器失败" + e);
}
}
+
+ public static long convertToTimestamp(Date date) {
+ // 获取时间戳（毫秒级别）
+ return date.getTime();
+ }
}
+
+
--
Gitblit v1.9.3