From 21cb23e9f2d5833cf642b0f15a60611c44b37a12 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 25 七月 2024 15:13:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-file/src/main/java/com/dy/dyFile/files/FileCtrl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-file/src/main/java/com/dy/dyFile/files/FileCtrl.java b/pms-parent/pms-web-file/src/main/java/com/dy/dyFile/files/FileCtrl.java
index 5e85b07..1750c48 100644
--- a/pms-parent/pms-web-file/src/main/java/com/dy/dyFile/files/FileCtrl.java
+++ b/pms-parent/pms-web-file/src/main/java/com/dy/dyFile/files/FileCtrl.java
@@ -13,7 +13,8 @@
import java.io.InputStream;
/**
- * web鏂囦欢涓婁紶
+ * web鏂囦欢涓婁紶, 鍐呴儴璋冪敤锛屽嵆鐢卞叾浠栧瓙妯″潡璋冪敤锛�
+ * 涓�鑸笉鐢卞墠绔郴缁熻皟鐢�
*/
@Slf4j
@RestController
@@ -71,6 +72,11 @@
zipFileInput = ZipImg.zipToJpg(fPic, photoZipWidth, photoZipWidth) ;
}
boolean zipOk = new FileUtil().saveFile(zipFilePath, zipFileInput) ;
+ //濡傛灉鍘嬬缉鏂囦欢涓嶅瓨鍦ㄦ垨鐢熸垚澶辫触锛屽垯澶嶅埗婧愭枃浠�
+ File zipFile = new File(zipFilePath);
+ if (!zipFile.exists() || zipFile.length()==0) {
+ zipOk = new FileUtil().saveFile(zipFilePath, file.getInputStream()) ;
+ }
}
}
}
--
Gitblit v1.8.0