From 87c0e43dd10660f762374dc608cd951a5bdc4054 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 2 Jun 2023 09:54:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 6 ++---- .../adc/da/att/service/impl/AttFileEOServiceImpl.java | 10 +++++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 247e3b1b..8442b060 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -4898,15 +4898,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandFiles = sarBussStandFileEODao.selectList(objectQueryWrapper); - // 为空暂不处理 不为空则意味pdf生成失败 if(!sarBussStandFiles.isEmpty()) { QueryWrapper objectQueryWrapperSarBussStandFile = new QueryWrapper<>(); objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID", sarBussStandFiles.get(0).getOriAttId()); + objectQueryWrapperSarBussStandFile.eq("USE_MODEL", "WEB_FILE"); List sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); - if(!sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==1){ + if(sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==0){ AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(sarBussStandFiles.get(0).getOriAttId()); if(attFileVo!=null){ SarBussStandFile sarBussStandFile = new SarBussStandFile(); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index 12df17d0..6af3c8da 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -601,15 +601,19 @@ public class AttFileEOServiceImpl extends ServiceImpl 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 i deleteById(attFileVo.getId()); logger.info("==================================word.docx删除成功========================"); } + if (outputFile.exists()) { + outputFile.delete(); + logger.info("==================================word.pdf删除成功========================"); + } } } From b4d0eab10e12116e9b19dbd36ceede8acc6079ef Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 2 Jun 2023 11:21:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussStandFileController.java | 2 +- .../service/ISarBussStandFileService.java | 2 +- .../impl/SarBussStandFileServiceImpl.java | 23 ++++++++----------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java index 867de294..22e08474 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java @@ -71,7 +71,7 @@ public class SarBussStandFileController extends BaseController @ApiOperation(value = "|SarBussStandFileEO|批量修改加密文件不能打开问题") @GetMapping("/batchUpdateSarBussFile") /*@RequiresPermissions("lawss:sarLawsFile:list")*/ - public ResponseMessage batchUpdateSarBussFile() throws Exception { + public ResponseMessage> batchUpdateSarBussFile() throws Exception { return sarBussStandFileEOService.batchUpdateSarBussFile(); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java index 6d05a20f..1e14182b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java @@ -18,5 +18,5 @@ public interface ISarBussStandFileService extends IService { List selectFileByAttId(String attId) throws Exception; - ResponseMessage batchUpdateSarBussFile(); + ResponseMessage> batchUpdateSarBussFile(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java index 70b1ec3d..dba442bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java @@ -49,30 +49,25 @@ public class SarBussStandFileServiceImpl extends ServiceImpl batchUpdateSarBussFile() { + public ResponseMessage> batchUpdateSarBussFile() { List objects = new ArrayList<>(); - QueryWrapper objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("USE_MODEL","SOURCE_FILE"); -// objectQueryWrapper.eq("FILE_SUFFIX","docx"); objectQueryWrapper.ne("FILE_SUFFIX","pdf"); objectQueryWrapper.ne("FILE_SUFFIX","PDF"); + objectQueryWrapper.ne("FILE_SUFFIX","xls"); + objectQueryWrapper.ne("FILE_SUFFIX","XLS"); List sarBussStandFiles = sarStandFileEODao.selectList(objectQueryWrapper); if(!sarBussStandFiles.isEmpty()){ for (SarBussStandFile data: sarBussStandFiles){ - QueryWrapper objectQueryWrapperSarBussStandFile = new QueryWrapper<>(); - objectQueryWrapperSarBussStandFile.eq("USE_MODEL","SOURCE_FILE"); objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID",data.getOriAttId()); -// objectQueryWrapper.eq("FILE_SUFFIX","docx"); - objectQueryWrapperSarBussStandFile.ne("FILE_SUFFIX","pdf"); - objectQueryWrapperSarBussStandFile.ne("FILE_SUFFIX","PDF"); - List sarBussStandFilesList = sarStandFileEODao.selectList(objectQueryWrapper); - if(!sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==1){ + objectQueryWrapperSarBussStandFile.eq("USE_MODEL","WEB_FILE"); + List sarBussStandFilesList = sarStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); + if(sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==0){ AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(data.getOriAttId()); if(attFileVo!=null){ SarBussStandFile sarBussStandFile = new SarBussStandFile(); - //sarBussStandFile.setId(); String uuId = com.adc.da.util.utils.UUID.randomUUID(20); sarBussStandFile.setId(uuId); sarBussStandFile.setStandId(data.getStandId()); @@ -88,14 +83,14 @@ public class SarBussStandFileServiceImpl extends ServiceImpl