From 9ba99567697a2c9bba49ca1a86bd361db13555ec Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 7 Jun 2023 11:41:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=97=AE=E9=A2=98=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/convert/mq/SendConvertMQService.java | 65 ++++++++++++++++++- .../mq/CreateOnlineEditingFileMQService.java | 24 +++++++ .../impl/SarBussionessStandServiceImpl.java | 42 ++++++------ 3 files changed, 109 insertions(+), 22 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/mq/CreateOnlineEditingFileMQService.java diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java index 94d3c848..d311b1f1 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java @@ -2,10 +2,10 @@ package com.adc.da.convert.mq; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.vo.AttFileVo; import com.adc.da.common.SarTypeEnum; import com.adc.da.common.UseModuleEnum; import com.adc.da.convert.common.AsposeOfficeConvertUtils; -import com.adc.da.convert.common.DocConverterPdf; import com.adc.da.mq.CreateMQService; import com.adc.da.slrs.otConvertMq.entity.OtConvertMq; import com.adc.da.slrs.otConvertMq.service.IOtConvertMqService; @@ -420,5 +420,66 @@ public class SendConvertMQService { } - + @RabbitListener(bindings = @QueueBinding( + value = @Queue(value = "createBussMQ_online_MQ_file", durable = "true"), + exchange = @Exchange(value = "create-online_MQ_file", ignoreDeclarationExceptions = "true"), + key = "create-key_online_MQ_file")) + public void createMQ(Map bussMap) throws Exception{ + try{ + try{ + if(bussMap!=null) { + String fileType = bussMap.get("FILE_SUFFIX"); + String converfilename = bussMap.get("CONVERFILENAME"); + String savePdfPath = bussMap.get("SAVEPDFPATH"); + String standId = bussMap.get("STANDID"); + String standFileClassify = bussMap.get("STANDFILECLASSIFY"); + String fileName = bussMap.get("FILENAME"); + String password = bussMap.get("PASSWORD"); + String oriAttId = bussMap.get("OAIATTID"); + logger.info("*****bussMap*******"+bussMap.toString()); + if(StringUtils.isNotBlank(fileType) && StringUtils.isNotBlank(converfilename) && StringUtils.isNotBlank(savePdfPath)) { + AsposeOfficeConvertUtils.convertOfficeFileToPDF(fileType, converfilename, savePdfPath); + File pdfFile = new File(savePdfPath); + if(pdfFile.exists()) { + logger.info("*****转换后的pdf文件路径*******" + savePdfPath); + AttFileVo attFileVo = attFileEOService.saveFileInfo(pdfFile); + if (attFileVo != null) { + if (StringUtils.isNotBlank(standId) + && StringUtils.isNotBlank(standFileClassify) + && StringUtils.isNotBlank(fileName) + && StringUtils.isNotBlank(oriAttId) + ) { + SarBussStandFile sarBussStandFile = new SarBussStandFile(); + //sarBussStandFile.setId(); + String uuId = com.adc.da.util.utils.UUID.randomUUID(20); + sarBussStandFile.setId(uuId); + sarBussStandFile.setStandId(standId); + sarBussStandFile.setStandFileClassify(standFileClassify); + sarBussStandFile.setAttId(attFileVo.getId()); + sarBussStandFile.setFileName(fileName); + sarBussStandFile.setFileSuffix(attFileVo.getFileSuffix()); + sarBussStandFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); + sarBussStandFile.setPassword(password); + sarBussStandFile.setValidFlag(0); + sarBussStandFile.setCreationTime(new Date()); + sarBussStandFile.setModifyTime(new Date()); + sarBussStandFile.setOriAttId(oriAttId); + sarBussStandFileEODao.insert(sarBussStandFile); + logger.error("在线编辑企业标准添加成功"); + } + } + } + }else { + logger.error("在线编辑企业标准参数为空"); + } + } + }catch(InterruptedException e){ + logger.error(e.toString()); + Thread.currentThread().interrupt(); + } + } catch (Exception e) { + logger.error("在线编辑企业标准消息队列进入转换前失败！"); + logger.error(e.getMessage(),e); + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/CreateOnlineEditingFileMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateOnlineEditingFileMQService.java new file mode 100644 index 00000000..608031ed --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateOnlineEditingFileMQService.java @@ -0,0 +1,24 @@ +package com.adc.da.mq; + +import org.springframework.amqp.core.AmqpTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component +public class CreateOnlineEditingFileMQService { + + @Autowired + private AmqpTemplate rabbitTemplate; + + /** + * + * @param + * @param + */ + public void OnlineEditingFileMQ(Map standMap){ + //发送消息队列 + this.rabbitTemplate.convertAndSend("create-online_MQ_file", "create-key_online_MQ_file", standMap); + } +} 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 2f967a0c..81297190 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 @@ -8,6 +8,7 @@ import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.mq.CreateMQService; +import com.adc.da.mq.CreateOnlineEditingFileMQService; import com.adc.da.mq.CreateStandMQService; import com.adc.da.person.dao.PersonCollectEODao; import com.adc.da.person.entity.TsPersonCollect; @@ -19,8 +20,6 @@ import com.adc.da.slrs.NewsFeed.entity.NewsFeed; import com.adc.da.slrs.NewsFeed.service.INewsFeedService; import com.adc.da.slrs.OnlineFileLog.dao.OnlineFileLogDao; import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; -import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao; -import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao; import com.adc.da.slrs.otConvertMq.entity.OtConvertMq; @@ -155,6 +154,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); if(sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==0){ - AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(sarBussStandFiles.get(0).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(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); + 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()); + createOnlineEditingFileMQService.OnlineEditingFileMQ(bussMap); }else { logger.info("======================================word.doc转换失败================================="); }