From 774dcb254d63f175aa1445bb852f784e3455aa1d Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 14 Jul 2023 09:32:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=BF=85=E9=A1=BB=E8=B5=B0=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84pdf=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 119 +++++++++++++++++- 1 file changed, 118 insertions(+), 1 deletion(-) 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 cde2233b..8785b628 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 @@ -4914,7 +4914,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl objectQueryWrapper = new QueryWrapper<>(); @@ -5008,6 +5008,123 @@ public class SarBussionessStandServiceImpl extends ServiceImpl objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("ORI_ATT_ID",fileId); + objectQueryWrapper.eq("USE_MODEL","SOURCE_FILE"); + //objectQueryWrapper.ne("FILE_SUFFIX","docx"); + List sarBussStandFiles = sarBussStandFileEODao.selectList(objectQueryWrapper); + if(!sarBussStandFiles.isEmpty()) { + //判断是否是在线编辑文件 + QueryWrapper onlineFileLogWrapper = new QueryWrapper<>(); + onlineFileLogWrapper.eq("ATT_FILE_ID",sarBussStandFiles.get(0).getOriAttId()); + List onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogWrapper); + if(!onlineFileLogs.isEmpty()){ + //在线编辑的情况下，判断是否有web + 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()){ + //删除当前pdf文件 + AttFileEO fileInfo = attFileEOService.getFileInfo(sarBussStandFilesList.get(0).getAttId()); + if(fileInfo!=null) { + File file = new File(filePath + fileInfo.getFilePath() + fileInfo.getFileName()); + if(file.exists()){ + file.delete(); + } + sarBussStandFileEODao.deleteById(sarBussStandFilesList.get(0).getId()); + } + } + if(StringUtils.isNotBlank(onlineFileLogs.get(0).getOLdFileName()) && StringUtils.isNotBlank(onlineFileLogs.get(0).getFilekey()) && StringUtils.isNotBlank(onlineFileLogs.get(0).getFilePath())){ + try { + logger.info("======================================远程调用转换开始启动================================="); + logger.info("=================================="+ onlineFileLogs.get(0).toString()); + File file = OnlyofficePdfUtil.downloadFile(onlyofficeUrl,filePath,onlineFileLogs.get(0).getOLdFileName(), onlineFileLogs.get(0).getFilekey(), onlineFileLogs.get(0).getFilePath()); + logger.info("======================================远程调用转换开始结束================================="); +// File file = new File(filePath+"/onlineFile/"+onlineFileLogs.get(0).getOLdFileName()); + logger.info("======================================file文件路径================================="+filePath+"/onlineFile/"+onlineFileLogs.get(0).getOLdFileName()); + if(file != null && file.exists()){ + logger.info("==============================文件所在位置：{}",file.getAbsolutePath()); + logger.info("======================================file文件保存================================="+filePath+"/onlineFile/"+onlineFileLogs.get(0).getOLdFileName()); + AttFileVo attFileVo = attFileEOService.saveFileInfo(file); + if (file.delete()) { + logger.info("==================删除临时文件成功================"); + }else{ + logger.info("====================删除临时文件失败================="); + } + if(attFileVo!=null){ + logger.info("============================文件ID：{}，文件存储位置：{}",attFileVo.getId(),attFileVo.getFilePath()); + SarBussStandFile sarBussStandFile = new SarBussStandFile(); + //sarBussStandFile.setId(); + String uuId = com.adc.da.util.utils.UUID.randomUUID(20); + sarBussStandFile.setId(uuId); + sarBussStandFile.setStandId(sarBussStandFiles.get(0).getStandId()); + sarBussStandFile.setStandFileClassify(sarBussStandFiles.get(0).getStandFileClassify()); + sarBussStandFile.setAttId(attFileVo.getId()); + sarBussStandFile.setFileName(filePath+attFileVo.getFilePath()+attFileVo.getFileName()); + sarBussStandFile.setFileSuffix(attFileVo.getFileSuffix()); + sarBussStandFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); + sarBussStandFile.setPassword(sarBussStandFiles.get(0).getPassword()); + sarBussStandFile.setValidFlag(0); + sarBussStandFile.setCreationTime(new Date()); + sarBussStandFile.setModifyTime(new Date()); + sarBussStandFile.setOriAttId(sarBussStandFiles.get(0).getOriAttId()); + sarBussStandFileEODao.insert(sarBussStandFile); + }else { + logger.info("======================================word.doc转换失败================================="); + } + }else { + logger.info("======================================pdf文件不存在！！！！================================="); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + }else { + //不是在线编辑 + //在线编辑的情况下，判断是否有web + QueryWrapper objectQueryWrapperSarBussStandFile = new QueryWrapper<>(); + objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID", sarBussStandFiles.get(0).getOriAttId()); + objectQueryWrapperSarBussStandFile.eq("USE_MODEL", "WEB_FILE"); + List sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); + //是空则证明 当前文件是普通pdf 非在线编辑 + if(sarBussStandFilesList.isEmpty()){ + AttFileEO fileInfo = attFileEOService.getFileInfo(sarBussStandFiles.get(0).getOriAttId()); + if(fileInfo!=null){ + String fileName = ""; + if(StringUtils.isNotBlank(fileInfo.getFileName())){ + String[] splitInfo = fileInfo.getFileName().split("\\."); + fileName = splitInfo[0]; + } + Map 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转换失败================================="); + } + } + } + } + } return "2"; } From cd915554b72c0ddf5f2ad1ebbd24d80f97228ad2 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 14 Jul 2023 09:54:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?pdf=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 8785b628..27907a1d 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 @@ -5042,6 +5042,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Fri, 14 Jul 2023 16:21:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 27907a1d..56f5420c 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 @@ -5037,10 +5037,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl