From b35dd737c03ee80d45753939ade49a59f556197f Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 22 May 2024 16:45:41 +0800
Subject: [PATCH] 航线问题修复，水印格式修改，图斑图片加水印
---
src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java b/src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java
index e64559a..834a1d1 100644
--- a/src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java
+++ b/src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java
@@ -1,5 +1,7 @@
package com.dji.sample.territory.utils;
+import org.springframework.stereotype.Component;
+
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.geom.AffineTransform;
@@ -10,20 +12,19 @@
import java.util.Date;
import static com.dji.sample.territory.utils.ImgZipUtil.compressImageAndGetFile;
-
+@Component
public class WaterMarkUtil {
/**
* 将图片加上水印并压缩
*
* @param file
- * @param path
* @param pssj
* @param lat
* @param lng
* @return 添加水印并压缩后的图片文件。
* @throws IOException 如果读取或保存图片失败。
*/
- public static File addWatermark(File file, String path, Long pssj, Double lat, Double lng, Double angles) throws IOException, FontFormatException {
+ public static File addWatermark(File file, Long pssj, Double lat, Double lng, Double angles) throws IOException, FontFormatException {
String angel=angle(angles);
Long timestamp = pssj; // 例如：Unix 时间戳（以秒为单位）
@@ -62,7 +63,7 @@
g2d.setComposite(alphaComposite);
String extraInfo = String.format("Lon:%.9f Lat:%.6f\n%s 时间:%s", lng, lat,angel,sd);
- File fontFile = new File("src/main/java/com/dji/sample/territory/utils/MiSans-Normal.ttf"); // 替换为你的字体文件路径
+ File fontFile = new File("/tmp/jave/MiSans-Normal.ttf"); // 替换为你的字体文件路径
Font customFont = Font.createFont(Font.TRUETYPE_FONT, fontFile).deriveFont(36.00F);
// 注册字体
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
--
Gitblit v1.9.3