合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!96
This commit is contained in:
高嵩
2023-06-02 11:50:51 +08:00
5 changed files with 22 additions and 21 deletions
@@ -601,15 +601,19 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
AttFileVo attFileVoPdf = null;
if(fileInfo != null){
File fileWord = new File(src+fileInfo.getFilePath()+fileInfo.getFileName());
logger.info("==================================fileWord文件路径========================"+src+fileInfo.getFilePath()+fileInfo.getFileName());
AttFileVo attFileVo = saveFileInfo(fileWord);
// 保存后 开始转换为 pdf版本
File inputWord = new File(src+attFileVo.getFilePath()+attFileVo.getFileName());
logger.info("==================================inputWord文件路径========================"+src+attFileVo.getFilePath()+attFileVo.getFileName());
String filePdfName = "";
if(StringUtils.isNotBlank(attFileVo.getFileName())){
String[] split = attFileVo.getFileName().split("\\.");
filePdfName = split[0]+".pdf";
}
File outputFile = new File(src+fileInfo.getFilePath(),filePdfName);
File outputFile = new File(src+fileInfo.getFilePath()+filePdfName);
logger.info("==================================outputFile文件路径========================"+src+fileInfo.getFilePath()+filePdfName);
try {
InputStream docxInputStream = new FileInputStream(inputWord);
OutputStream outputStream = new FileOutputStream(outputFile);
@@ -627,6 +631,10 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
deleteById(attFileVo.getId());
logger.info("==================================word.docx删除成功========================");
}
if (outputFile.exists()) {
outputFile.delete();
logger.info("==================================word.pdf删除成功========================");
}
}
}