From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/territory/service/impl/TbFjServiceImpl.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 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 afc83aa..79de333 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,10 @@
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 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;
@@ -27,6 +27,8 @@
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;
@@ -40,6 +42,8 @@
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.territory.utils.SM3.sm3;
@Service
@DS("sqlite-ret")
@@ -122,36 +126,32 @@
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);
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);
+ byte[] bytesArray = Files.readAllBytes(file1.toPath());
+ fjhxz= sm3(bytesArray);
FJ = fileToByteArray(file1);
} else {
file1 = VideoZipUtil.compressVideo(file, 800000, 128000, 1280, 720);
FJ = fileToByteArray(file1);
}
- String sm3 = Sm3Util.calculateSM3Hash(fjhxz + "," + pssj + "," + lng + "," + lat + "," + gimbalYawDegree + "," + psjd + "," + pshgj + "," + psry + "," + zsdm);
-
- byte[] hash = sm3.getBytes(); // 注意：使用SM3或其他哈希算法来计算数据的哈希值
- // 加载私钥
- ECPrivateKeyParameters sm2PrivateKey = getSM2PrivateKey();
- // 使用SM2私钥对哈希值进行签名
- String signatureHex = signWithSM2(hash, sm2PrivateKey);
+ 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)
@@ -173,7 +173,7 @@
.pshgj(pshgj)
.zsdm(zsdm)
.psry(psry)
- .jym(signatureHex)
+ .jym(jyms)
.url(url)
.pstz(pstz)
.fjyskd(width)
@@ -256,10 +256,5 @@
BigDecimal bd = new BigDecimal(value).setScale(7, RoundingMode.DOWN);
return bd.doubleValue();
- }
-
- public static void main(String[] args) {
- System.out.println(truncateToSevenDecimalPlaces(152.00666565));
- System.out.println(truncateToTwoDecimalPlaces(12.006));
}
}
--
Gitblit v1.9.3