From f287e7c52b25d8e0ca64cbddd8d41aca04f57422 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 3 May 2022 12:30:23 +0800
Subject: [PATCH 1/2] feat: There is no way the,

---
 .../impl/SarStandardsInfoServiceImpl.java     | 130 +++++++++---------
 1 file changed, 68 insertions(+), 62 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 231b9add..5457a19c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -2971,42 +2971,45 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
 //                    String readFilePath = "E:\\上汽企标流程总览.pdf";
                     try {
-                        // 判断文件是docx还是PDF
-                        if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("DOC") || attFileEO.getFileSuffix().equals("DOCX") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
-                            if (attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("DOC") || attFileEO.getFileSuffix().equals("DOCX")) {
-                                BufferedInputStream bis = new BufferedInputStream(new FileInputStream(new File(readFilePath)));
-                                if (FileMagic.valueOf(bis) == FileMagic.OOXML) {
-                                    XWPFDocument doc = new XWPFDocument(bis);
-                                    XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
+                        File existsFile = new File(readFilePath);
+                        if(existsFile.exists()){
+                            // 判断文件是docx还是PDF
+                            if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("DOC") || attFileEO.getFileSuffix().equals("DOCX") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
+                                if (attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("DOC") || attFileEO.getFileSuffix().equals("DOCX")) {
+                                    BufferedInputStream bis = new BufferedInputStream(new FileInputStream(new File(readFilePath)));
+                                    if (FileMagic.valueOf(bis) == FileMagic.OOXML) {
+                                        XWPFDocument doc = new XWPFDocument(bis);
+                                        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
+                                        String txt = extractor.getText();
+                                        content.append(txt);
+                                        extractor.close();
+                                    }else {
+                                        WordExtractor wordExtractor = new WordExtractor(bis);
+                                        String txt = wordExtractor.getText();
+                                        content.append(txt);
+                                        wordExtractor.close();
+                                    }
+                                    bis.close();
+                                } else {
+                                    OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
+                                    XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
                                     String txt = extractor.getText();
                                     content.append(txt);
-                                    extractor.close();
-                                }else {
-                                    WordExtractor wordExtractor = new WordExtractor(bis);
-                                    String txt = wordExtractor.getText();
-                                    content.append(txt);
-                                    wordExtractor.close();
+                                    opcPackage.close();
                                 }
-                                bis.close();
                             } else {
-                                OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
-                                XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
-                                String txt = extractor.getText();
-                                content.append(txt);
-                                opcPackage.close();
+                                PDDocument document = PDDocument.load(new File(readFilePath));
+                                document.getClass();
+                                if (!document.isEncrypted()) {
+                                    PDFTextStripperByArea stripper = new PDFTextStripperByArea();
+                                    stripper.setSortByPosition(true);
+                                    PDFTextStripper tStripper = new PDFTextStripper();
+                                    String pdfFileInText = tStripper.getText(document);
+                                    // String[] lines = pdfFileInText.split("\\r?\\n");
+                                    content.append(pdfFileInText);
+                                }
+                                document.close();
                             }
-                        } else {
-                            PDDocument document = PDDocument.load(new File(readFilePath));
-                            document.getClass();
-                            if (!document.isEncrypted()) {
-                                PDFTextStripperByArea stripper = new PDFTextStripperByArea();
-                                stripper.setSortByPosition(true);
-                                PDFTextStripper tStripper = new PDFTextStripper();
-                                String pdfFileInText = tStripper.getText(document);
-                                // String[] lines = pdfFileInText.split("\\r?\\n");
-                                content.append(pdfFileInText);
-                            }
-                            document.close();
                         }
                     } catch (Exception e) {
                         logger.error("搜索中心新增数据读取文档内容时失败");
@@ -3044,42 +3047,45 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     }
                     String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
                     try {
-                        // 判断文件是docx还是PDF
-                        if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("DOC") || attFileEO.getFileSuffix().equals("DOCX") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
-                            if (attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("DOC") || attFileEO.getFileSuffix().equals("DOCX")) {
-                                BufferedInputStream bis = new BufferedInputStream(new FileInputStream(new File(readFilePath)));
-                                if (FileMagic.valueOf(bis) == FileMagic.OOXML) {
-                                    XWPFDocument doc = new XWPFDocument(bis);
-                                    XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
+                        File existsFile = new File(readFilePath);
+                        if(existsFile.exists()){
+                            // 判断文件是docx还是PDF
+                            if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("DOC") || attFileEO.getFileSuffix().equals("DOCX") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
+                                if (attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("DOC") || attFileEO.getFileSuffix().equals("DOCX")) {
+                                    BufferedInputStream bis = new BufferedInputStream(new FileInputStream(new File(readFilePath)));
+                                    if (FileMagic.valueOf(bis) == FileMagic.OOXML) {
+                                        XWPFDocument doc = new XWPFDocument(bis);
+                                        XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
+                                        String txt = extractor.getText();
+                                        content.append(txt);
+                                        extractor.close();
+                                    }else {
+                                        WordExtractor wordExtractor = new WordExtractor(bis);
+                                        String txt = wordExtractor.getText();
+                                        content.append(txt);
+                                        wordExtractor.close();
+                                    }
+                                    bis.close();
+                                } else {
+                                    OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
+                                    XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
                                     String txt = extractor.getText();
                                     content.append(txt);
-                                    extractor.close();
-                                }else {
-                                    WordExtractor wordExtractor = new WordExtractor(bis);
-                                    String txt = wordExtractor.getText();
-                                    content.append(txt);
-                                    wordExtractor.close();
+                                    opcPackage.close();
                                 }
-                                bis.close();
                             } else {
-                                OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
-                                XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
-                                String txt = extractor.getText();
-                                content.append(txt);
-                                opcPackage.close();
+                                PDDocument document = PDDocument.load(new File(readFilePath));
+                                document.getClass();
+                                if (!document.isEncrypted()) {
+                                    PDFTextStripperByArea stripper = new PDFTextStripperByArea();
+                                    stripper.setSortByPosition(true);
+                                    PDFTextStripper tStripper = new PDFTextStripper();
+                                    String pdfFileInText = tStripper.getText(document);
+                                    // String[] lines = pdfFileInText.split("\\r?\\n");
+                                    content.append(pdfFileInText);
+                                }
+                                document.close();
                             }
-                        } else {
-                            PDDocument document = PDDocument.load(new File(readFilePath));
-                            document.getClass();
-                            if (!document.isEncrypted()) {
-                                PDFTextStripperByArea stripper = new PDFTextStripperByArea();
-                                stripper.setSortByPosition(true);
-                                PDFTextStripper tStripper = new PDFTextStripper();
-                                String pdfFileInText = tStripper.getText(document);
-                                // String[] lines = pdfFileInText.split("\\r?\\n");
-                                content.append(pdfFileInText);
-                            }
-                            document.close();
                         }
                     } catch (Exception e) {
                         logger.error("搜索中心修改数据读取文档内容时失败");

From d10099e227be66040c6c66dbe761123c41e48972 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 3 May 2022 12:53:35 +0800
Subject: [PATCH 2/2] feat: There is no way the,

---
 .../service/impl/SarStandardsInfoServiceImpl.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 5457a19c..f9720a00 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -2966,7 +2966,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , ");
             StringBuilder content = new StringBuilder("");
             for (int i = 0; i < attidlist.length; i++) {
-                if (org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i])) {
+                if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && attidlist[i].contains("att_file")) {
                     AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
                     String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
 //                    String readFilePath = "E:\\上汽企标流程总览.pdf";
@@ -3040,7 +3040,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(",");
             StringBuilder content = new StringBuilder("");
             for (int i = 0; i < attidlist.length; i++) {
-                if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i])) {
+                if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && attidlist[i].contains("att_file")) {
                     AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
                     if (null == attFileEO) {
                         continue;