DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lixuetao' into lixuetao

Browse Source
This commit is contained in:
bupengxiang
2023-05-26 10:55:24 +08:00
parent 400d5bc28a 206938b8d0
commit 5a2f1513ed
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
+10 -2
View File
@@ -34,6 +34,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
@@ -42,6 +43,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -436,7 +438,7 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
@Override
public String reportHtml(String reportId, String fileId) {
try {
String key = reportId + fileId;
String key = reportId + "-" + fileId;
String html = stringRedisTemplate.boundValueOps(key).get();
//没有的话就生成
if (StrUtil.isBlank(html)) {
@@ -841,7 +843,13 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
} else if (ReportConstants.FILE_EXTENSIONS_DOCX.equalsIgnoreCase(fileEntity.getFileType())) {
html = WordUtil.doc2pdf(new FileInputStream(path), uploadFile, ipAddress);
} else if (ReportConstants.FILE_EXTENSIONS_PPT.equalsIgnoreCase(fileEntity.getFileType())) {
html = PptUtil.doPpt2003toImage(new FileInputStream(path), uploadFile, ipAddress);
try {
html = PptUtil.doPpt2003toImage(new FileInputStream(path), uploadFile, ipAddress);
} catch (OfficeXmlFileException e) {
String newPath = path + "x";
cn.hutool.core.io.FileUtil.rename(new File(path), newPath, false, false);
html = PptUtil.doPpt2007toImage(new FileInputStream(newPath), uploadFile, ipAddress);
}
} else if (ReportConstants.FILE_EXTENSIONS_PPTX.equalsIgnoreCase(fileEntity.getFileType())) {
html = PptUtil.doPpt2007toImage(new FileInputStream(path), uploadFile, ipAddress);
} else if (ReportConstants.FILE_EXTENSIONS_PDF.equalsIgnoreCase(fileEntity.getFileType())) {