FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
gaojiabao
2023-06-02 09:54:08 +08:00
parent 08b16ff16b
commit 87c0e43dd1
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+2 -4
View File
@@ -4898,15 +4898,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
objectQueryWrapper.eq("ORI_ATT_ID",fileId); objectQueryWrapper.eq("ORI_ATT_ID",fileId);
objectQueryWrapper.eq("USE_MODEL","SOURCE_FILE"); objectQueryWrapper.eq("USE_MODEL","SOURCE_FILE");
objectQueryWrapper.eq("FILE_SUFFIX","docx"); objectQueryWrapper.eq("FILE_SUFFIX","docx");
// objectQueryWrapper.ne("FILE_SUFFIX","pdf");
// objectQueryWrapper.ne("FILE_SUFFIX","PDF");
List<SarBussStandFile> sarBussStandFiles = sarBussStandFileEODao.selectList(objectQueryWrapper); List<SarBussStandFile> sarBussStandFiles = sarBussStandFileEODao.selectList(objectQueryWrapper);
// 为空暂不处理 不为空则意味pdf生成失败
if(!sarBussStandFiles.isEmpty()) { if(!sarBussStandFiles.isEmpty()) {
QueryWrapper<SarBussStandFile> objectQueryWrapperSarBussStandFile = new QueryWrapper<>(); QueryWrapper<SarBussStandFile> objectQueryWrapperSarBussStandFile = new QueryWrapper<>();
objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID", sarBussStandFiles.get(0).getOriAttId()); objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID", sarBussStandFiles.get(0).getOriAttId());
objectQueryWrapperSarBussStandFile.eq("USE_MODEL", "WEB_FILE");
List<SarBussStandFile> sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); List<SarBussStandFile> sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile);
if(!sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==1){ if(sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==0){
AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(sarBussStandFiles.get(0).getOriAttId()); AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(sarBussStandFiles.get(0).getOriAttId());
if(attFileVo!=null){ if(attFileVo!=null){
SarBussStandFile sarBussStandFile = new SarBussStandFile(); SarBussStandFile sarBussStandFile = new SarBussStandFile();
adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java
+9 -1
View File
@@ -601,15 +601,19 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
AttFileVo attFileVoPdf = null; AttFileVo attFileVoPdf = null;
if(fileInfo != null){ if(fileInfo != null){
File fileWord = new File(src+fileInfo.getFilePath()+fileInfo.getFileName()); File fileWord = new File(src+fileInfo.getFilePath()+fileInfo.getFileName());
logger.info("==================================fileWord文件路径========================"+src+fileInfo.getFilePath()+fileInfo.getFileName());
AttFileVo attFileVo = saveFileInfo(fileWord); AttFileVo attFileVo = saveFileInfo(fileWord);
// 保存后 开始转换为 pdf版本 // 保存后 开始转换为 pdf版本
File inputWord = new File(src+attFileVo.getFilePath()+attFileVo.getFileName()); File inputWord = new File(src+attFileVo.getFilePath()+attFileVo.getFileName());
logger.info("==================================inputWord文件路径========================"+src+attFileVo.getFilePath()+attFileVo.getFileName());
String filePdfName = ""; String filePdfName = "";
if(StringUtils.isNotBlank(attFileVo.getFileName())){ if(StringUtils.isNotBlank(attFileVo.getFileName())){
String[] split = attFileVo.getFileName().split("\\."); String[] split = attFileVo.getFileName().split("\\.");
filePdfName = split[0]+".pdf"; 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 { try {
InputStream docxInputStream = new FileInputStream(inputWord); InputStream docxInputStream = new FileInputStream(inputWord);
OutputStream outputStream = new FileOutputStream(outputFile); OutputStream outputStream = new FileOutputStream(outputFile);
@@ -627,6 +631,10 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
deleteById(attFileVo.getId()); deleteById(attFileVo.getId());
logger.info("==================================word.docx删除成功========================"); logger.info("==================================word.docx删除成功========================");
} }
if (outputFile.exists()) {
outputFile.delete();
logger.info("==================================word.pdf删除成功========================");
}
} }
} }