From 3d37a280c2bbefc5769053ec7298a0211ab79b8d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 26 Apr 2024 08:49:33 +0800
Subject: [PATCH] 新增坐标系转换,在DB数据进出库时进行转换。优化DB成果展示的临时文件问题。

---
 src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/dji/sample/territory/utils/WaterMark.java b/src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java
similarity index 94%
rename from src/main/java/com/dji/sample/territory/utils/WaterMark.java
rename to src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java
index 3fb012a..359ab80 100644
--- a/src/main/java/com/dji/sample/territory/utils/WaterMark.java
+++ b/src/main/java/com/dji/sample/territory/utils/WaterMarkUtil.java
@@ -4,18 +4,14 @@
 import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
 import static com.dji.sample.territory.utils.ImgZipUtil.compressImageAndGetFile;
 
-public class WaterMark {
+public class WaterMarkUtil {
     /**
      * 将图片加上水印并压缩
      *
@@ -36,7 +32,7 @@
         try {
             originalImage = ImageIO.read(originalImageFile);
         } catch (IOException e) {
-            throw new IllegalArgumentException("读取图片失败"+e.getMessage());
+            throw new IllegalArgumentException("读取图片失败" + e.getMessage());
         }
 
         // 创建 Graphics2D 对象以在图像上绘制水印
@@ -91,15 +87,15 @@
         // 释放 Graphics2D 对象
         g2d.dispose();
         // 保存添加水印后的图片
-        File outputFile = new File(path + "mark.jpg");
+        File outputFile = File.createTempFile("mark", ".jpg");
         File originalImageFiles = new File(outputFile.toURI());
-        float compressionQuality = 0.5f; // 0.0 - 1.0, higher value means better quality
-        File compressedImageFile = compressImageAndGetFile(originalImageFiles, compressionQuality);
         try {
             ImageIO.write(originalImage, "jpg", outputFile);
         } catch (IOException e) {
             throw new IllegalArgumentException("水印图片保存失败");
         }
+        float compressionQuality = 0.5f; // 0.0 - 1.0, higher value means better quality
+        File compressedImageFile = compressImageAndGetFile(originalImageFiles, compressionQuality);
         return compressedImageFile;
     }
 

--
Gitblit v1.9.3