From a0e7cf2d16dc23b1d6edf3b69678ab66ccacb54d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 12 Jun 2024 15:51:14 +0800
Subject: [PATCH] 图斑生成航线，图片哈希值
---
src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 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 b8c2ccd..87426ca 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
@@ -10,10 +10,7 @@
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.HashUtil;
-import com.dji.sample.territory.utils.Sm3Util;
-import com.dji.sample.territory.utils.VideoZipUtil;
-import com.dji.sample.territory.utils.WaterMarkUtil;
+import com.dji.sample.territory.utils.*;
import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -132,25 +129,22 @@
String numberPart = focal.replaceAll("[^\\d]", "");
int psjj = Integer.parseInt(numberPart);
json.getString("GimbalYawDegree");
- String fjhxz = HashUtil.SM3Hash(file);
BufferedImage image = ImageIO.read(file);
int width = image.getWidth();
int height = image.getHeight();
+ String fjhxz = null;
//对应图片和视频文件进行不同处理
boolean endsWith = key.endsWith(".mp4");
if (!endsWith) {
file1 = WaterMarkUtil.addWatermark(file, sj, lat, lng, gimbalYawDegree);
+ fjhxz = String.valueOf(SM3HashExample.HaXi(new File(file1.toURI())));
FJ = fileToByteArray(file1);
} else {
file1 = VideoZipUtil.compressVideo(file, 800000, 128000, 1280, 720);
FJ = fileToByteArray(file1);
}
String hxz = HashUtil.calculateHash((fjhxz + "," + pssj + "," + lng + "," + lat + "," + gimbalYawDegree + "," + psjd + "," + pshgj + "," + psry + "," + zsdm).getBytes());
- byte[] hash = hxz.getBytes(); // 注意：使用SM3或其他哈希算法来计算数据的哈希值
- // 加载私钥
- ECPrivateKeyParameters sm2PrivateKey = getSM2PrivateKey();
- // 使用SM2私钥对哈希值进行签名
- String signatureHex = signWithSM2(hash, sm2PrivateKey);
+ String jym=SM2SignExamples.jym(hxz);
TbFjEntity.TbFjEntityBuilder builder = TbFjEntity.builder();
if (lotInfo != null) {
builder.bsm(bsm)
@@ -172,7 +166,7 @@
.pshgj(pshgj)
.zsdm(zsdm)
.psry(psry)
- .jym(signatureHex)
+ .jym(jym)
.url(url)
.pstz(pstz)
.fjyskd(width)
@@ -258,7 +252,7 @@
}
public static void main(String[] args) {
- System.out.println(truncateToSevenDecimalPlaces(152.00666565));
- System.out.println(truncateToTwoDecimalPlaces(12.006));
+ String s= String.valueOf(SM3HashExample.HaXi(new File("src/main/resources/FJ_10.jpeg")));
+ System.out.println(s);
}
}
--
Gitblit v1.9.3