From 595f3f55f269a5b5be593d4dfa80e7b3eca45b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=9B=84?= <admin@cxcp.com>
Date: Fri, 9 Jan 2026 17:36:26 +0800
Subject: [PATCH] =?UTF-8?q?tif=20=E4=BC=98=E5=8C=96=E5=A4=9A=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=E8=BD=AC=E6=8D=A2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/keking/service/impl/TiffFilePreviewImpl.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java
index 489cbf35..d931dd09 100644
--- a/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java
@@ -5,7 +5,7 @@ import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
 import cn.keking.service.FileHandlerService;
 import cn.keking.service.FilePreview;
-import cn.keking.utils.ConvertPicUtil;
+import cn.keking.service.TifToService;
 import cn.keking.utils.DownloadUtils;
 import cn.keking.utils.KkFileUtils;
 import cn.keking.utils.WebUtils;
@@ -25,9 +25,11 @@ public class TiffFilePreviewImpl implements FilePreview {
 
     private final FileHandlerService fileHandlerService;
     private final OtherFilePreviewImpl otherFilePreview;
-    public TiffFilePreviewImpl(FileHandlerService fileHandlerService,OtherFilePreviewImpl otherFilePreview) {
+    private final TifToService tiftoservice;
+    public TiffFilePreviewImpl(FileHandlerService fileHandlerService,OtherFilePreviewImpl otherFilePreview,TifToService tiftoservice) {
         this.fileHandlerService = fileHandlerService;
         this.otherFilePreview = otherFilePreview;
+        this.tiftoservice = tiftoservice;
     }
     @Override
     public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
@@ -45,7 +47,7 @@ public class TiffFilePreviewImpl implements FilePreview {
                 String filePath = response.getContent();
                 if ("pdf".equalsIgnoreCase(tifPreviewType)) {
                     try {
-                       ConvertPicUtil.convertJpg2Pdf(filePath, outFilePath);
+                        tiftoservice.convertTif2Pdf(filePath, outFilePath);
                     } catch (Exception e) {
                         if (e.getMessage().contains("Bad endianness tag (not 0x4949 or 0x4d4d)") ) {
                             model.addAttribute("imgUrls", url);
@@ -69,7 +71,7 @@ public class TiffFilePreviewImpl implements FilePreview {
                     // 将tif转换为jpg，返回转换后的文件路径、文件名的list
                     List<String> listPic2Jpg;
                     try {
-                        listPic2Jpg = ConvertPicUtil.convertTif2Jpg(filePath, outFilePath,forceUpdatedCache);
+                        listPic2Jpg = tiftoservice.convertTif2Jpg(filePath, outFilePath,forceUpdatedCache);
                     } catch (Exception e) {
                         if (e.getMessage().contains("Bad endianness tag (not 0x4949 or 0x4d4d)") ) {
                             model.addAttribute("imgUrls", url);