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 710a849a..cde2233b 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 @@ -4920,7 +4920,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("ORI_ATT_ID",fileId); objectQueryWrapper.eq("USE_MODEL","SOURCE_FILE"); - objectQueryWrapper.eq("FILE_SUFFIX","docx"); + //objectQueryWrapper.ne("FILE_SUFFIX","docx"); List sarBussStandFiles = sarBussStandFileEODao.selectList(objectQueryWrapper); if(!sarBussStandFiles.isEmpty()) { QueryWrapper objectQueryWrapperSarBussStandFile = new QueryWrapper<>(); @@ -4929,9 +4929,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); if(sarBussStandFilesList.size() == 0){ //存储的名称,key 路径 - QueryWrapper onlineFileLogWrapper = new QueryWrapper<>(); - onlineFileLogWrapper.eq("ATT_FILE_ID",sarBussStandFiles.get(0).getOriAttId()); - List onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogWrapper); + List onlineFileLogs = null; + if(StringUtils.isNotBlank(sarBussStandFiles.get(0).getFileSuffix()) && sarBussStandFiles.get(0).getFileSuffix().equals("docx")){ + QueryWrapper onlineFileLogWrapper = new QueryWrapper<>(); + onlineFileLogWrapper.eq("ATT_FILE_ID",sarBussStandFiles.get(0).getOriAttId()); + onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogWrapper); + } if(!onlineFileLogs.isEmpty()){ if(StringUtils.isNotBlank(onlineFileLogs.get(0).getOLdFileName()) && StringUtils.isNotBlank(onlineFileLogs.get(0).getFilekey()) && StringUtils.isNotBlank(onlineFileLogs.get(0).getFilePath())){ try { @@ -4978,9 +4981,29 @@ public class SarBussionessStandServiceImpl extends ServiceImpl bussMap = new HashMap<>(); + bussMap.put("FILE_SUFFIX",sarBussStandFiles.get(0).getFileSuffix()); + bussMap.put("CONVERFILENAME",filePath+fileInfo.getFilePath()+fileInfo.getFileName()); + bussMap.put("SAVEPDFPATH",filePath+fileInfo.getFilePath()+fileName+".pdf"); + bussMap.put("STANDID",sarBussStandFiles.get(0).getStandId()); + bussMap.put("STANDFILECLASSIFY",sarBussStandFiles.get(0).getStandFileClassify()); + bussMap.put("FILENAME",filePath+fileInfo.getFilePath()+fileName+".pdf"); + bussMap.put("PASSWORD",sarBussStandFiles.get(0).getPassword()); + bussMap.put("OAIATTID",sarBussStandFiles.get(0).getOriAttId()); + logger.info("======================================word.doc发送mq================================="); + createOnlineEditingFileMQService.OnlineEditingFileMQ(bussMap); + }else { + logger.info("======================================word.doc转换失败================================="); + } } } }