From eee8b90148ab8b8fe7f9951b4be6a52b92f253e0 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 1 May 2022 13:01:42 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20=E5=9D=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 4d1de039..97a63b41 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
@@ -2979,16 +2979,19 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                     XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
                                     String txt = extractor.getText();
                                     content.append(txt);
+                                    extractor.close();
                                 }else {
                                     WordExtractor wordExtractor = new WordExtractor(fis);
                                     String txt = wordExtractor.getText();
                                     content.append(txt);
+                                    wordExtractor.close();
                                 }
                             } else {
                                 OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
                                 XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
                                 String txt = extractor.getText();
                                 content.append(txt);
+                                opcPackage.close();
                             }
                         } else {
                             PDDocument document = PDDocument.load(new File(readFilePath));
@@ -3000,6 +3003,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 String pdfFileInText = tStripper.getText(document);
                                 // String[] lines = pdfFileInText.split("\\r?\\n");
                                 content.append(pdfFileInText);
+                                document.close();
                             }
                         }
                     } catch (Exception e) {

From 99c634858496164c8ebfb4ce93fc8ebb3dc767e0 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 1 May 2022 13:07:57 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20=20k?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandardsInfoServiceImpl.java                | 1 +
 1 file changed, 1 insertion(+)

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 97a63b41..53abe44f 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
@@ -2986,6 +2986,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                     content.append(txt);
                                     wordExtractor.close();
                                 }
+                                fis.close();
                             } else {
                                 OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
                                 XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);

From 415af05e8b3925e2d2ea76ccc9a066792e015e6f Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 1 May 2022 13:17:17 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20kkkkkkk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandardsInfoServiceImpl.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 53abe44f..82585ee2 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
@@ -3004,8 +3004,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 String pdfFileInText = tStripper.getText(document);
                                 // String[] lines = pdfFileInText.split("\\r?\\n");
                                 content.append(pdfFileInText);
-                                document.close();
                             }
+                            document.close();
                         }
                     } catch (Exception e) {
                         logger.error("搜索中心新增数据读取文档内容时失败");

From 529ece1f95815dc16e3855a2ef8a70b01910519c Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 1 May 2022 13:30:54 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96ES=20kkkkkkkkkkk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandardsInfoServiceImpl.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 82585ee2..246e15bd 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
@@ -111,6 +111,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.sql.Clob;
@@ -2973,20 +2974,20 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         // 判断文件是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")) {
-                                FileInputStream fis = new FileInputStream(readFilePath);
-                                if (FileMagic.valueOf(fis) == FileMagic.OOXML) {
-                                    XWPFDocument doc = new XWPFDocument(fis);
+                                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(fis);
+                                    WordExtractor wordExtractor = new WordExtractor(bis);
                                     String txt = wordExtractor.getText();
                                     content.append(txt);
                                     wordExtractor.close();
                                 }
-                                fis.close();
+                                bis.close();
                             } else {
                                 OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
                                 XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);

From 7ade4cb7bc5014420f8586e70ef83df89f9a9905 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 1 May 2022 14:16:35 +0800
Subject: [PATCH 5/5] =?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=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B4=A2=E5=BC=95=E7=9A=84max=5Fresult=5Fwin?=
 =?UTF-8?q?dow=E5=8F=82=E6=95=B0=20=E4=BF=AE=E6=94=B9=20ES=20=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=8E=9F=E7=94=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/search/service/impl/SearchCenterServiceImpl.java  | 5 +++--
 1 file changed, 3 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 826f0598..3469ce58 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
@@ -1221,7 +1221,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         hiBuilder.field(highlightDate);
         hiBuilder.preTags("<span class='highlight-class'>");
         hiBuilder.postTags("</span>");
-        updateIndex("fulltextserch",99999999,2);
+        updateIndex("fulltextserch",(searchInfoEO.getPage()-1)*searchInfoEO.getPageSize(),searchInfoEO.getPageSize());
         searchRequestBuilder = client.prepareSearch("fulltextserch")
                 .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
                 .highlighter(hiBuilder)
@@ -1515,7 +1515,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         hiBuilder.preTags("<span class='highlight-class'>");
         hiBuilder.postTags("</span>");
 
-        updateIndex("fulltextserch",99999999,2);
+        updateIndex("fulltextserch",(searchInfoEO.getPage()-1)*searchInfoEO.getPageSize(),searchInfoEO.getPageSize());
         searchRequestBuilder = client.prepareSearch("fulltextserch")
                 .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
                 .highlighter(hiBuilder)
@@ -1586,6 +1586,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         AcknowledgedResponse indexResponse = client.admin().indices()
                 .prepareUpdateSettings(indices)
                 .setSettings(Settings.builder()
+                        .put("index.max_result_window", records)
                         .put("highlight.max_analyzed_offset", records)
                         .build()
                 ).get();