From 3430a3dd889ba51d06cbdb77014aa63d0a070e48 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 16 Aug 2024 16:38:08 +0800
Subject: [PATCH] 优化国土对接接口
---
src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java | 64 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 27 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 79de333..e4c774b 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,46 +3,38 @@
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.service.IFileService;
import com.dji.sample.media.util.ImgUtil;
import com.dji.sample.patches.config.pojo.PatchesConfigPojo;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.territory.dao.ITbFjMapper;
import com.dji.sample.territory.model.entity.TbFjEntity;
+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
@@ -52,7 +44,14 @@
private ITbFjMapper tbFjMapper;
@Autowired
private PatchesConfigPojo patchesConfigPojo;
-
+ @Autowired
+ private TerritoryConfigPojo territoryConfigPojo;
+ @Autowired
+ private MinioPojo pojo;
+ @Autowired
+ private IFileService fileService;
+ @Autowired
+ private WaterMarkUtil waterMarkUtil;
/**
* 按照地块编号所对应的信息和音视频文件存入sqlite数据库
*
@@ -76,11 +75,10 @@
return count;
}
- public void insertOneData(MediaFileEntity mediaFile, LotInfo lotInfo) throws Exception {
+ public int insertOneData(MediaFileEntity mediaFile, LotInfo lotInfo) throws Exception {
TbFjEntity tbFj = dbConvertToEntity(mediaFile, lotInfo);
- if (tbFj.getFjysgd() == 3000) {
tbFjMapper.insert(tbFj);
- }
+ return 0;
}
@Override
@@ -108,6 +106,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]))));
@@ -142,10 +143,11 @@
//对应图片和视频文件进行不同处理
boolean endsWith = key.endsWith(".mp4");
if (!endsWith) {
- file1 = WaterMarkUtil.addWatermark(file, sj, lat, lng, gimbalYawDegree);
+ file1 = waterMarkUtil.addWatermark(file, sj, lat, lng, gimbalYawDegree,lotInfo.getType());
byte[] bytesArray = Files.readAllBytes(file1.toPath());
fjhxz= sm3(bytesArray);
FJ = fileToByteArray(file1);
+// fileService.saveMarkFile(lotInfo.getWorkspaceId(),mediaFile,file1);
} else {
file1 = VideoZipUtil.compressVideo(file, 800000, 128000, 1280, 720);
FJ = fileToByteArray(file1);
@@ -183,29 +185,36 @@
// else {
//// throw new IllegalArgumentException("未匹配到相关地块");
// }
+ file.delete();
return builder.build();
}
/**
- * 将音视频文件转换成字节流
+ * 文件下载
*
* @param fileUrl
* @return
*/
public static File downloadFile(String fileUrl) {
File downloadedFile = null;
+
try {
URL url = new URL(fileUrl);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET");
- downloadedFile = new File(File.createTempFile("temp", ".jpeg").toURI());
- InputStream inputStream = connection.getInputStream();
- OutputStream outputStream = new FileOutputStream(downloadedFile);
- byte[] buffer = new byte[1024];
- int bytesRead;
- while ((bytesRead = inputStream.read(buffer)) != -1) {
- outputStream.write(buffer, 0, bytesRead);
+ // 创建临时文件
+ File tempFile = File.createTempFile("temp", ".jpeg");
+ downloadedFile = tempFile;
+
+ // 使用 try-with-resources 确保流被关闭
+ try (InputStream inputStream = connection.getInputStream();
+ OutputStream outputStream = new FileOutputStream(downloadedFile)) {
+ byte[] buffer = new byte[1024];
+ int bytesRead;
+ while ((bytesRead = inputStream.read(buffer)) != -1) {
+ outputStream.write(buffer, 0, bytesRead);
+ }
}
} catch (IOException e) {
e.printStackTrace();
@@ -228,7 +237,6 @@
fis.close();
return data;
}
-
public static String convertTimestampToDateTime(long timestamp) {
// 将时间戳转换为 Instant 对象
Instant instant = Instant.ofEpochMilli(timestamp);
@@ -242,6 +250,7 @@
}
public static Double truncateToTwoDecimalPlaces(Double value) {
+ //小数点只保留两位
if (value == null) {
return null; // 处理null值情况
}
@@ -250,6 +259,7 @@
}
public static Double truncateToSevenDecimalPlaces(Double value) {
+ //小数点只保留七位
if (value == null) {
return null; // 处理null值情况
}
--
Gitblit v1.9.3