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 | 171 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 133 insertions(+), 38 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..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
@@ -1,15 +1,13 @@
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.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dji.sample.common.model.Pagination;
import com.dji.sample.common.model.PaginationData;
+import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.oss.model.OssConfiguration;
import com.dji.sample.component.oss.service.impl.OssServiceContext;
import com.dji.sample.manage.model.dto.DeviceDictionaryDTO;
@@ -19,23 +17,29 @@
import com.dji.sample.media.dao.IMarkMapper;
import com.dji.sample.media.model.*;
import com.dji.sample.media.service.IFileService;
+import com.dji.sample.media.util.ImgUtil;
+import com.dji.sample.patches.dao.GetPatchesMapper;
+import com.dji.sample.patches.model.entity.LotInfo;
+import com.dji.sample.patches.utils.TimerUtil;
import com.dji.sample.territory.service.impl.TbFjServiceImpl;
import com.dji.sample.territory.utils.WaterMarkUtil;
+import com.drew.imaging.ImageProcessingException;
+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;
/**
@@ -52,8 +56,9 @@
@Autowired
private IMarkMapper markMapper;
@Autowired
+ private GetPatchesMapper patchesMapper;
+ @Autowired
private IDeviceDictionaryService deviceDictionaryService;
-
@Autowired
private OssServiceContext ossService;
@@ -83,25 +88,63 @@
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());
+
+ public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException {
+ boolean endsWith = file.getObjectKey().endsWith(".mp4");
+ if (endsWith) {
+ MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
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);
+ 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);
}
+ }
+
+ @Override
+ public Object mediaInfo(String filename) {
+ String name = "mark" + filename;
+ MediaFileMarkEntity entity = markMapper.selectOne(new LambdaQueryWrapper<MediaFileMarkEntity>()
+ .eq(MediaFileMarkEntity::getFileName, name));
+ return entity.getDronedata();
+ }
+
@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 +153,37 @@
@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(String dkbh, String workspaceId) {
+ return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId)
+ .like(MediaFileEntity::getFileName, dkbh + "~"));
+ }
+
+ public ResponseResult updateExamByFileId(String fileId) {
+ int examineStatus = getExamByFileId(fileId);
+ if (examineStatus == 1) {
+ LambdaUpdateWrapper<MediaFileEntity> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(MediaFileEntity::getFileId, fileId)
+ .set(MediaFileEntity::getExamine, 0);
+ mapper.update(null, updateWrapper);
+ return ResponseResult.success("审核未通过");
+ } else if (examineStatus == 0) {
+ LambdaUpdateWrapper<MediaFileEntity> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(MediaFileEntity::getFileId, fileId)
+ .set(MediaFileEntity::getExamine, 1);
+ mapper.update(null, updateWrapper);
+ return ResponseResult.success("审核通过");
+ }
+ return ResponseResult.error("媒体文件不存在");
+ }
+
+ public int getExamByFileId(String fileId) {
+ MediaFileEntity entity = mapper.selectOne(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getFileId, fileId));
+ return entity.getExamine();
}
@Override
@@ -121,7 +194,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 +203,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 +222,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 +236,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 +245,7 @@
/**
* Convert the received file object into a database entity object.
+ *
* @param file
* @return
*/
@@ -181,6 +256,7 @@
builder.fileName(file.getName())
.filePath(file.getPath())
.isadd(0)
+ .examine(1)
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
@@ -200,6 +276,7 @@
}
return builder.build();
}
+
private MediaFileMarkEntity fileUploadConvertToMarkEntity(FileUploadDTO file) {
MediaFileMarkEntity.MediaFileMarkEntityBuilder builder = MediaFileMarkEntity.builder();
@@ -230,6 +307,7 @@
/**
* Convert database entity objects into file data transfer object.
+ *
* @param entity
* @return
*/
@@ -255,16 +333,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