From 87c0e43dd10660f762374dc608cd951a5bdc4054 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Fri, 2 Jun 2023 09:54:08 +0800
Subject: [PATCH] =?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<SarBussionessStan
             objectQueryWrapper.eq("ORI_ATT_ID",fileId);
             objectQueryWrapper.eq("USE_MODEL","SOURCE_FILE");
             objectQueryWrapper.eq("FILE_SUFFIX","docx");
-//            objectQueryWrapper.ne("FILE_SUFFIX","pdf");
-//            objectQueryWrapper.ne("FILE_SUFFIX","PDF");
             List<SarBussStandFile> sarBussStandFiles = sarBussStandFileEODao.selectList(objectQueryWrapper);
-            // 为空暂不处理 不为空则意味pdf生成失败
             if(!sarBussStandFiles.isEmpty()) {
                 QueryWrapper<SarBussStandFile> objectQueryWrapperSarBussStandFile = new QueryWrapper<>();
                 objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID", sarBussStandFiles.get(0).getOriAttId());
+                objectQueryWrapperSarBussStandFile.eq("USE_MODEL", "WEB_FILE");
                 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());
                     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<AttFileEODao, AttFileEO> 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<AttFileEODao, AttFileEO> i
                             deleteById(attFileVo.getId());
                             logger.info("==================================word.docx删除成功========================");
                         }
+                        if (outputFile.exists()) {
+                            outputFile.delete();
+                            logger.info("==================================word.pdf删除成功========================");
+                        }
                     }
                 }