From 82e4e5f6129be2e691138cd8b8ea3262e64943af Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 04 Jul 2024 15:54:19 +0800
Subject: [PATCH] 修改播放地址
---
src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 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 5d2bd7b..451f285 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
@@ -9,6 +9,7 @@
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;
@@ -52,6 +53,8 @@
private ITbFjMapper tbFjMapper;
@Autowired
private PatchesConfigPojo patchesConfigPojo;
+ @Autowired
+ private TerritoryConfigPojo territoryConfigPojo;
/**
* 按照地块编号所对应的信息和音视频文件存入sqlite数据库
@@ -126,12 +129,11 @@
String head = "http://dev.jxpskj.com:9000/cloud-bucket";
String url = head + key;
File file = downloadFile(url);
-// JSONObject jsonObjects = JSONObject.parseObject(ImgUtil.getInfo(file));
JSONObject jsons = (JSONObject) (ImgUtil.getInfo(file));
String str = jsons.toJSONString();
String newstr = str.replace("+", "");
JSONObject json = JSON.parseObject(newstr);
- Double pitch = json.getDouble("GimbalPitchDegree");
+ double pitch = json.getDouble("GimbalPitchDegree");
String focal = json.getString("FocalLength");
String numberPart = focal.replaceAll("[^\\d]", "");
int psjj = Integer.parseInt(numberPart);
@@ -151,11 +153,8 @@
file1 = VideoZipUtil.compressVideo(file, 800000, 128000, 1280, 720);
FJ = fileToByteArray(file1);
}
- String hxz =(sm3((fjhxz + "," + pssj + "," + lng + "," + lat + "," + gimbalYawDegree + "," + psjd + "," + pshgj + "," + psry + "," + zsdm).getBytes()));
- SM2SignVO sm2signVO = SM2SignVerUtils.Sign2SM2(Util.hexStringToBytes("23E57DA1E4AB865CCBC325B668762207DEF74345B782237808AE0BABDF26734D"), hxz.getBytes(StandardCharsets.UTF_8));
- String jym= sm2signVO.getSm2_signForHard().toUpperCase();
- StringBuffer buffer=SM3.addStringBuffer(fjhxz,pssj,lng,lat,gimbalYawDegree,psjd,pshgj,psry,zsdm);
- String jyms= addJym(buffer);
+ StringBuffer buffer=SM3.addStringBuffer(fjhxz,pssj,truncateToSevenDecimalPlaces(lng),truncateToSevenDecimalPlaces(lat),(int)pitch,(int)psjd,pshgj,psry,zsdm);
+ String jyms= SM3.addJym(buffer);
TbFjEntity.TbFjEntityBuilder builder = TbFjEntity.builder();
if (lotInfo != null) {
builder.bsm(bsm)
@@ -246,6 +245,7 @@
}
public static Double truncateToTwoDecimalPlaces(Double value) {
+ //小数点只保留两位
if (value == null) {
return null; // 处理null值情况
}
@@ -254,16 +254,12 @@
}
public static Double truncateToSevenDecimalPlaces(Double value) {
+ //小数点只保留七位
if (value == null) {
return null; // 处理null值情况
}
BigDecimal bd = new BigDecimal(value).setScale(7, RoundingMode.DOWN);
return bd.doubleValue();
- }
-
- public static void main(String[] args) {
- String s= String.valueOf(SM3HashExample.HaXi(new File("src/main/resources/FJ_10.jpeg")));
- System.out.println(s);
}
}
--
Gitblit v1.9.3