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 | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 0f534bd..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,17 +1,15 @@
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.patches.utils.MultipartFileTOFileUtil;
import com.dji.sample.territory.dao.ITbFjMapper;
import com.dji.sample.territory.model.entity.TbFjEntity;
import com.dji.sample.territory.service.ITbFJService;
import com.dji.sample.territory.utils.VideoZipUtil;
-import com.dji.sample.territory.utils.WaterMark;
+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;
@@ -22,6 +20,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+
+import static com.dji.sample.territory.utils.CoordinateSystemUtil.*;
@Service
@DS("sqlite-ret")
@@ -73,6 +73,9 @@
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";
@@ -93,7 +96,7 @@
//对应图片和视频文件进行不同处理
boolean endsWith = key.endsWith(".mp4");
if (!endsWith) {
- file1 = WaterMark.addWatermark(file, patchesConfigPojo.getUnzip(), pssj, lat, lng);
+ file1 = WaterMarkUtil.addWatermark(file, patchesConfigPojo.getUnzip(), pssj, lat, lng,gimbalYawDegree);
FJ = fileToByteArray(file1);
} else {
file1 = VideoZipUtil.compressVideo(file, 800000, 128000, 1280, 720);
@@ -107,8 +110,8 @@
.dklx(dklx)
.xdgd(relativeAltitude)
.jdgd(absoluteAltitude)
- .Latitude(lat)
- .longitude(lng)
+ .Latitude(x)
+ .longitude(y)
.fj(FJ)
.fjmc(fjmc)
.fjlx(fjlx)
@@ -136,12 +139,11 @@
*/
public File downloadFile(String fileUrl) {
File downloadedFile = null;
- String localFilePath = patchesConfigPojo.getUnzip() + "tmp.jpg";
try {
URL url = new URL(fileUrl);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET");
- downloadedFile = new File(localFilePath);
+ downloadedFile = new File(File.createTempFile("temp", ".jpeg").toURI());
InputStream inputStream = connection.getInputStream();
OutputStream outputStream = new FileOutputStream(downloadedFile);
byte[] buffer = new byte[1024];
--
Gitblit v1.9.3