From 6e6a04dd9ddedbc9e8ca5fa01fe13b566ad53046 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 3 May 2022 09:41:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20e?=
 =?UTF-8?q?s=20=E8=AF=BB=E5=8F=96=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarStandardsInfoServiceImpl.java     | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 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 246e15bd..231b9add 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
@@ -3045,19 +3045,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
                     try {
                         // 判断文件是docx还是PDF
-                        if (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc")) {
-                            if (attFileEO.getFileSuffix().equals("doc")) {
-                                FileInputStream fis = new FileInputStream(readFilePath);
-                                WordExtractor wordExtractor = new WordExtractor(fis);
-                                String txt = wordExtractor.getText();
-                                content.append(txt);
+                        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);
+                                opcPackage.close();
                             }
-                        } else if (attFileEO.getFileSuffix().equals("pdf")) {
+                        } else {
                             PDDocument document = PDDocument.load(new File(readFilePath));
                             document.getClass();
                             if (!document.isEncrypted()) {
@@ -3068,12 +3079,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 // String[] lines = pdfFileInText.split("\\r?\\n");
                                 content.append(pdfFileInText);
                             }
+                            document.close();
                         }
-//                        String readFilePath = "E:\\上汽企标流程总览.pdf";
-//                        FileInputStream fis = new FileInputStream(readFilePath);
-//                        WordExtractor wordExtractor = new WordExtractor(fis);
-//                        String txt = wordExtractor.getText();
-//                        content.append(txt);
                     } catch (Exception e) {
                         logger.error("搜索中心修改数据读取文档内容时失败");
                         logger.error(e.getMessage(), e);

From a2cf5bbd776cd1cc4d7feae0afef30bf2105dddc Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 3 May 2022 09:45:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=20i?=
 =?UTF-8?q?ssue=5Ftime=5Fdata?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/search/service/impl/SearchCenterServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
index 2a582b0a..3958ee4f 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
@@ -84,7 +84,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
                 .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
                 .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
-                .addSort("issue_time_order", SortOrder.DESC)
+                .addSort("issue_time_data", SortOrder.DESC)
                 .setSize(searchInfoEO.getPageSize());
 
         if(searchInfoEO.getSelectIndex().equals("stand")) {
@@ -211,7 +211,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
                 .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
                 .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
-                .addSort("issue_time_order", SortOrder.DESC)
+                .addSort("issue_time_data", SortOrder.DESC)
                 .setSize(searchInfoEO.getPageSize());
 
         if(searchInfoEO.getSelectIndex().equals("stand")) {