From 1e6561acc89b7105c1dcbf5395845d6046f1453d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 16:55:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/files/FileCtrl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/files/FileCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/files/FileCtrl.java
index 62f19d8..02626f9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/files/FileCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/files/FileCtrl.java
@@ -3,6 +3,7 @@
import com.dy.common.util.NumUtil;
import com.dy.pipIrrWebFile.util.*;
import lombok.extern.slf4j.Slf4j;
+import org.jcodec.scale.AWTUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -159,13 +160,13 @@
}else {
//瀛樺偍鎴愬姛, 鐢熸垚缂╃暐鍥�
BufferedImage bufImg = new VideoUtils(VideoZipPicFileType, VideoZipPicFromFrame).fetchFrame(file) ;
- int index = filePath.lastIndexOf(".") ;
- String basePath = filePath.substring(0, index) ;
+ // 鍚戝彸鏃嬭浆90搴�
+ // bufImg = AWTUtil.rotate90ToRight(bufImg) ;
+ String zipFilePath = filePath.substring(0, filePath.lastIndexOf(".")) + "_." + VideoZipPicFileType ;
Integer photoZipWidth = 400 ;
if(photoZipWidthStr != null && NumUtil.isPlusIntNumber(photoZipWidthStr)){
photoZipWidth = Integer.parseInt(photoZipWidthStr) ;
}
- String zipFilePath = basePath + "_." + VideoZipPicFileType ;
InputStream zipFileInput = ZipImg.zipToJpg(bufImg, photoZipWidth, photoZipWidth) ;
if(zipFileInput.available() > 0){
new FileUtil().saveFile(zipFilePath, zipFileInput) ;
--
Gitblit v1.8.0