From 7baabc20800670388eeb074c12868b8ec8ec139d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 06 三月 2025 09:51:10 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 742af90..5ffffde 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -36,8 +36,10 @@
import com.ruoyi.inspect.mapper.InsUnqualifiedHandlerMapper;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.InformationNotificationService;
+import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -65,6 +67,7 @@
* @createDate 2024-03-17 22:10:02
*/
@Service
+@Slf4j
public class InsReportServiceImpl extends ServiceImpl<InsReportMapper, InsReport>
implements InsReportService {
@Resource
@@ -81,8 +84,7 @@
private String wordUrl;
@Value("${file.path}")
private String imgUrl;
- @Value("${file.licenseUrl}")
- private String licenseUrl;
+
@Resource
private InsOrderMapper insOrderMapper;
@Resource
@@ -535,12 +537,16 @@
}
// 鍘嬬缉涓存椂鏂囦欢澶�
zipFilePath = wordUrl + "/zip/output.zip";
+ // 鍒ゆ柇zip璺緞鏄惁瀛樺湪
+ File zipDir = new File(wordUrl + "/zip");
+ if(!zipDir.isDirectory()){
+ zipDir.mkdirs();
+ }
zipDirectory(tempFolderPath, zipFilePath);
// 娓呯悊涓存椂鏂囦欢澶�
deleteDirectory(tempFolder);
- System.out.println("ZIP鏂囦欢鍒涘缓瀹屾垚锛�");
} catch (IOException e) {
e.printStackTrace();
}
@@ -675,13 +681,11 @@
FileOutputStream os = null;
try {
//鍑瘉 涓嶇劧鍒囨崲鍚庢湁姘村嵃
-// InputStream is = this.getClass().getResourceAsStream("/lib/license.xml");
-// InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("license.xml");
- InputStream is = Files.newInputStream(new File(licenseUrl).toPath());
+ InputStream is = new ClassPathResource("/lib/license.xml").getInputStream();
License license = new License();
license.setLicense(is);
if (!license.getIsLicensed()) {
- System.out.println("License楠岃瘉涓嶉�氳繃...");
+ log.info("License楠岃瘉涓嶉�氳繃...");
return null;
}
//鐢熸垚涓�涓┖鐨凱DF鏂囦欢
@@ -1116,11 +1120,11 @@
FileOutputStream os = null;
try {
//鍑瘉 涓嶇劧鍒囨崲鍚庢湁姘村嵃
- InputStream is = Files.newInputStream(new File(licenseUrl).toPath());
+ InputStream is = new ClassPathResource("/lib/license.xml").getInputStream();
License license = new License();
license.setLicense(is);
if (!license.getIsLicensed()) {
- System.out.println("License楠岃瘉涓嶉�氳繃...");
+ log.info("License楠岃瘉涓嶉�氳繃...");
return null;
}
//鐢熸垚涓�涓┖鐨凱DF鏂囦欢
@@ -1131,7 +1135,6 @@
//瑕佽浆鎹㈢殑word鏂囦欢
com.aspose.words.Document doc = new com.aspose.words.Document(wordPath);
doc.save(os, SaveFormat.PDF);
- String name = file.getName();
return file.getName();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.3