From bc16d0f0fc46ca6cb7d9bfb8496ad8f20ffba677 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 06 May 2024 14:53:52 +0800
Subject: [PATCH] 修改DB库相关问题
---
src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 22 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 6e85ecb..336f61a 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
@@ -1,16 +1,18 @@
package com.dji.sample.territory.service.impl;
-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.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.service.ITbFJService;
-import com.google.gson.JsonObject;
+import com.dji.sample.territory.utils.VideoZipUtil;
+import com.dji.sample.territory.utils.WaterMarkUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.io.*;
import java.net.HttpURLConnection;
@@ -19,11 +21,15 @@
import java.util.List;
import java.util.UUID;
+import static com.dji.sample.territory.utils.CoordinateSystemUtil.*;
+
@Service
-@DS("sqlite")
+@DS("sqlite-ret")
public class TbFjServiceImpl implements ITbFJService {
@Autowired
- private ITbFjMapper mapper;
+ private ITbFjMapper tbFjMapper;
+ @Autowired
+ private PatchesConfigPojo patchesConfigPojo;
/**
* 按照地块编号所对应的信息和音视频文件存入sqlite数据库
@@ -33,6 +39,7 @@
* @return
* @throws IOException
*/
+ @Transactional
public int insertData(List<MediaFileEntity> mediaFile, LotInfo lotInfo) throws IOException {
int count = 0;
List<TbFjEntity> list = new ArrayList<>();
@@ -41,7 +48,7 @@
MediaFileEntity file = mediaFile.get(i);
tbFj = dbConvertToEntity(file, lotInfo);
list.add(tbFj);
- mapper.insert(tbFj);
+ tbFjMapper.insert(tbFj);
count++;
}
return count;
@@ -55,7 +62,9 @@
* @return
* @throws IOException
*/
- private TbFjEntity dbConvertToEntity(MediaFileEntity mediaFile, LotInfo lotInfo) {
+ private TbFjEntity dbConvertToEntity(MediaFileEntity mediaFile, LotInfo lotInfo) throws IOException {
+ File file1 = null;
+ byte[] FJ = null;
String jsonString = JSONObject.toJSONString(mediaFile.getMetadata());
JSONObject jsonObject = JSONObject.parseObject(jsonString);
Double absoluteAltitude = jsonObject.getDouble("absoluteAltitude");
@@ -64,6 +73,10 @@
JSONObject shootPosition = jsonObject.getJSONObject("shootPosition");
Double lat = shootPosition.getDouble("lat");
Double lng = shootPosition.getDouble("lng");
+ double[] coordinates = extractCoordinates(pointWGStoCGCS(lng, lat));
+ double x = Double.parseDouble(((formatCoordinate(coordinates[1]))));
+ double y = Double.parseDouble(((formatCoordinate(coordinates[0]))));
+ //本地数据库没有的数据在FJ表非空用0
int psjd = 0;
String fjhxz = "0";
int pshgj = 0;
@@ -72,13 +85,23 @@
String zsdm = "0";
String dklx = "0";
String xzqdm = "0";
+ int fjlx = 1;
Long pssj = mediaFile.getCreateTime();
String bsm = UUID.randomUUID().toString();
String fjmc = mediaFile.getFileName();
String key = mediaFile.getObjectKey();
String head = "http://dev.jxpskj.com:9000/cloud-bucket";
String url = head + key;
- byte[] FJ = downloadFileAsBytes(url);
+ File file = downloadFile(url);
+ //对应图片和视频文件进行不同处理
+ boolean endsWith = key.endsWith(".mp4");
+ if (!endsWith) {
+ file1 = WaterMarkUtil.addWatermark(file, patchesConfigPojo.getUnzip(), pssj, lat, lng,gimbalYawDegree);
+ FJ = fileToByteArray(file1);
+ } else {
+ file1 = VideoZipUtil.compressVideo(file, 800000, 128000, 1280, 720);
+ FJ = fileToByteArray(file1);
+ }
TbFjEntity.TbFjEntityBuilder builder = TbFjEntity.builder();
if (lotInfo != null) {
builder.bsm(bsm)
@@ -87,11 +110,11 @@
.dklx(dklx)
.xdgd(relativeAltitude)
.jdgd(absoluteAltitude)
- .Latitude(lat)
- .longitude(lng)
+ .Latitude(x)
+ .longitude(y)
.fj(FJ)
.fjmc(fjmc)
- .fjlx(1)
+ .fjlx(fjlx)
.psfyj(gimbalYawDegree)
.pssj(String.valueOf(pssj))
.psjd(psjd)
@@ -100,6 +123,7 @@
.zsdm(zsdm)
.psry(psry)
.jym(jym)
+ .url(url)
.build();
} else {
throw new IllegalArgumentException("未匹配到相关地块");
@@ -113,27 +137,40 @@
* @param fileUrl
* @return
*/
- public static byte[] downloadFileAsBytes(String fileUrl) {
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
+ public 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);
- try (InputStream inputStream = connection.getInputStream()) {
- byte[] buffer = new byte[1024];
- int bytesRead;
- while ((bytesRead = inputStream.read(buffer)) != -1) {
- outputStream.write(buffer, 0, bytesRead);
- }
}
-
} catch (IOException e) {
e.printStackTrace();
}
- return outputStream.toByteArray();
+ return downloadedFile;
}
-}
+ /**
+ * 将文件转换为字节数组。
+ *
+ * @param file 需要转换的文件对象。
+ * @return 文件内容的字节数组。
+ * @throws IOException 如果读取文件发生错误。
+ */
+ public static byte[] fileToByteArray(File file) throws IOException {
+ FileInputStream fis = new FileInputStream(file);
+ byte[] data = new byte[(int) file.length()];
+ fis.read(data);
+ fis.close();
+ return data;
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3