From 636b54a1e782c2662d6163269093da7d5368664e Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 23 Jul 2024 18:29:51 +0800
Subject: [PATCH] 更新媒体文件存入，将源文件、水印文件、缩略图分离
---
src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java b/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java
index 451f285..87b8024 100644
--- a/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java
+++ b/src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java
@@ -3,7 +3,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.dji.sample.media.model.MediaFileEntity;
+import com.dji.sample.media.dao.IMarkMapper;
+import com.dji.sample.media.model.*;
import com.dji.sample.media.util.ImgUtil;
import com.dji.sample.patches.config.pojo.PatchesConfigPojo;
import com.dji.sample.patches.model.entity.LotInfo;
@@ -12,38 +13,27 @@
import com.dji.sample.territory.pojo.TerritoryConfigPojo;
import com.dji.sample.territory.service.ITbFJService;
import com.dji.sample.territory.utils.*;
-import com.dji.sample.territory.utils.jym.SM2SignVO;
-import com.dji.sample.territory.utils.jym.SM2SignVerUtils;
-import com.dji.sample.territory.utils.jym.Util;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.imageio.ImageIO;
-import javax.xml.crypto.Data;
import java.awt.image.BufferedImage;
import java.io.*;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
-import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.UUID;
-import static com.dji.sample.territory.utils.CoordinateSystemUtil.*;
-import static com.dji.sample.territory.utils.SM2SignUtil.getSM2PrivateKey;
-import static com.dji.sample.territory.utils.SM2SignUtil.signWithSM2;
-import static com.dji.sample.territory.utils.SM3.addJym;
+import static com.dji.sample.media.service.impl.FileServiceImpl.uploadFile;
import static com.dji.sample.territory.utils.SM3.sm3;
@Service
@@ -55,7 +45,10 @@
private PatchesConfigPojo patchesConfigPojo;
@Autowired
private TerritoryConfigPojo territoryConfigPojo;
-
+ @Autowired
+ private MinioPojo pojo;
+ @Autowired
+ private IMarkMapper markMapper;
/**
* 按照地块编号所对应的信息和音视频文件存入sqlite数据库
*
@@ -111,6 +104,9 @@
JSONObject shootPosition = jsonObject.getJSONObject("shootPosition");
Double lat = shootPosition.getDouble("lat");
Double lng = shootPosition.getDouble("lng");
+ PositionDTO position=new PositionDTO();
+ position.setLat(lat);
+ position.setLng(lng);
// double[] coordinates = extractCoordinates(pointWGStoCGCS(lng, lat));
// double x = Double.parseDouble(((formatCoordinate(coordinates[1]))));
// double y = Double.parseDouble(((formatCoordinate(coordinates[0]))));
@@ -149,6 +145,7 @@
byte[] bytesArray = Files.readAllBytes(file1.toPath());
fjhxz= sm3(bytesArray);
FJ = fileToByteArray(file1);
+ saveMarkFile(lotInfo.getWorkspaceId(),mediaFile,file1);
} else {
file1 = VideoZipUtil.compressVideo(file, 800000, 128000, 1280, 720);
FJ = fileToByteArray(file1);
@@ -186,6 +183,7 @@
// else {
//// throw new IllegalArgumentException("未匹配到相关地块");
// }
+ file.delete();
return builder.build();
}
@@ -231,6 +229,22 @@
fis.close();
return data;
}
+ public void saveMarkFile(String workspaceId, MediaFileEntity file,File file1) {
+ try {
+ MediaFileMarkEntity mediaFileMarkEntity= new MediaFileMarkEntity();
+ mediaFileMarkEntity.setWorkspaceId(workspaceId);
+ mediaFileMarkEntity.setIsadd(0);
+ mediaFileMarkEntity.setIsOriginal(false);
+ mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
+ mediaFileMarkEntity.setObjectKey("/mark" + file.getFilePath()+ "/" + file.getFileName());
+ mediaFileMarkEntity.setFileName("mark" + file.getFileName());
+ mediaFileMarkEntity.setFilePath("mark" + file.getFilePath());
+ uploadFile(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), mediaFileMarkEntity.getObjectKey(), file1, "image/jpeg");
+ markMapper.insert(mediaFileMarkEntity);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
public static String convertTimestampToDateTime(long timestamp) {
// 将时间戳转换为 Instant 对象
--
Gitblit v1.9.3