From ba2d208eec4ac0ec31574107d6096d31a8152362 Mon Sep 17 00:00:00 2001 From: Yvan Date: Mon, 7 Dec 2020 10:00:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-44390=20alpha-fine=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3=EF=BC=8C=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E8=AF=A6=E7=BB=86=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=96=87=E6=A1=A3=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E3=80=91=E6=9C=AC=E5=9C=B0=E5=B8=B8=E7=94=A8=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9C=89=E7=82=B9=E9=97=AE=E9=A2=98=EF=BC=8C=E6=AF=94?= =?UTF-8?q?=E5=A6=82=E7=94=A8=E6=88=B7=E6=90=9C=E7=B4=A2"=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=A1=AB=E6=8A=A5"=EF=BC=8C=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=AF=8D=E8=A2=AB=E8=A7=A3=E6=9E=90=E6=88=90=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=AF=8D=E7=BB=84=EF=BC=8C=E9=81=8D=E5=8E=86=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=AF=8D=E7=BB=84=E5=8E=BB=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E9=87=8C=E4=BC=9A=E5=B0=86=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E9=9B=86=E5=85=88=E6=B8=85=E7=A9=BA=E7=84=B6=E5=90=8E?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=EF=BC=8C=E7=84=B6=E5=90=8E?= =?UTF-8?q?=E6=8A=8A=E8=BF=99=E4=B8=AA=E8=BF=94=E5=9B=9E=E7=9A=84=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=8F=88=E8=B5=8B=E5=80=BC=E7=BB=99=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E9=9B=86=E5=90=88=EF=BC=8C=E8=BF=99=E4=BC=9A=E4=B8=8D=E6=96=AD?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=BB=93=E6=9E=9C=E9=9B=86=E5=90=88=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E5=8F=AA?= =?UTF-8?q?=E6=98=AF=E5=85=B3=E9=94=AE=E8=AF=8D=E7=BB=84=E4=B8=AD=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E4=B8=AA=E5=85=83=E7=B4=A0=E7=9A=84=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=20=E3=80=90=E6=94=B9=E5=8A=A8?= =?UTF-8?q?=E6=80=9D=E8=B7=AF=E3=80=91=E5=9C=A8=E6=90=9C=E7=B4=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E7=9A=84=E9=80=BB=E8=BE=91=E9=87=8C=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E7=BB=93=E6=9E=9C=E9=9B=86=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=8E=BB=E6=8E=89=EF=BC=8C=E6=94=BE=E5=88=B0=E6=9B=B4?= =?UTF-8?q?=E4=B8=8A=E5=B1=82=E7=9A=84=E9=81=8D=E5=8E=86=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E6=A0=B7=E5=B0=B1=E4=B8=8D=E6=98=AF=E6=AF=8F?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E9=81=8D=E5=8E=86=E5=B0=B1=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=9B=86=EF=BC=8C=E8=80=8C=E6=98=AF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=AF=8F=E4=B8=80=E6=AC=A1=E6=90=9C=E7=B4=A2=E6=89=8D?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E7=BB=93=E6=9E=9C=E9=9B=86=EF=BC=8C=E7=84=B6?= =?UTF-8?q?=E5=90=8E=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=B9=9F=E6=97=A0=E9=A1=BB=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E7=BB=99=E7=BB=93=E6=9E=9C=E9=9B=86=EF=BC=8C=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E5=9C=A8=E6=90=9C=E7=B4=A2=E7=9A=84=E6=97=B6=E5=80=99=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E6=B7=BB=E5=8A=A0=E5=88=B0=E7=BB=93=E6=9E=9C=E9=9B=86?= =?UTF-8?q?=E4=B8=AD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/manager/impl/RecentSearchManager.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java index 72a485977..3c7de497a 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java @@ -45,9 +45,9 @@ import java.util.List; */ public class RecentSearchManager implements AlphaFineSearchProvider { private static final int MAX_SIZE = 100; - + private static final RecentSearchManager INSTANCE = new RecentSearchManager(); - + private IndexReader indexReader = null; //索引存储路径 private String path = ProductConstants.getEnvHome() + File.separator + "searchIndex"; @@ -58,18 +58,18 @@ public class RecentSearchManager implements AlphaFineSearchProvider { private IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_40, analyzer); private IndexWriter indexWriter = null; private SearchResult recentModelList = new SearchResult(); - + public static RecentSearchManager getInstance() { - + return INSTANCE; } @Override public SearchResult getLessSearchResult(String[] searchText) { - + this.recentModelList = new SearchResult(); SearchResult modelList = new SearchResult(); for (String aSearchText : searchText) { - recentModelList = getRecentModelList(aSearchText); + getRecentModelList(aSearchText); } if (recentModelList != null && recentModelList.size() > 0) { modelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Latest"))); @@ -86,7 +86,7 @@ public class RecentSearchManager implements AlphaFineSearchProvider { public SearchResult getMoreSearchResult(String searchText) { return new SearchResult(); } - + private synchronized SearchResult getRecentModelList(String searchText) { return searchBySort(searchText); } @@ -161,7 +161,6 @@ public class RecentSearchManager implements AlphaFineSearchProvider { * 按序搜索 */ private synchronized SearchResult searchBySort(String key) { - recentModelList = new SearchResult(); try { initReader(); @@ -175,7 +174,6 @@ public class RecentSearchManager implements AlphaFineSearchProvider { Query query = new TermQuery(term); TopFieldDocs docs = searcher.search(query, MAX_SIZE, sortKey); ScoreDoc[] scores = docs.scoreDocs; - this.recentModelList = new SearchResult(); //遍历结果 for (ScoreDoc scoreDoc : scores) { Document document = searcher.doc(scoreDoc.doc); From 63779ffdcf6c8470218c2718f7345341eb672c09 Mon Sep 17 00:00:00 2001 From: Yvan Date: Mon, 7 Dec 2020 11:15:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-44390=20alpha-fine=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3=EF=BC=8C=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E8=AF=A6=E7=BB=86=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=96=87=E6=A1=A3=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=20=E6=94=B9=E5=8A=A8=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E6=96=B9=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/manager/impl/RecentSearchManager.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java index 3c7de497a..d9b93fb55 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java @@ -69,7 +69,7 @@ public class RecentSearchManager implements AlphaFineSearchProvider { this.recentModelList = new SearchResult(); SearchResult modelList = new SearchResult(); for (String aSearchText : searchText) { - getRecentModelList(aSearchText); + addToRecentModelList(aSearchText); } if (recentModelList != null && recentModelList.size() > 0) { modelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Latest"))); @@ -87,8 +87,12 @@ public class RecentSearchManager implements AlphaFineSearchProvider { return new SearchResult(); } - private synchronized SearchResult getRecentModelList(String searchText) { - return searchBySort(searchText); + /** + * 将单次遍历的关键词的搜索结果添加到结果集中 + * @param searchText + */ + private synchronized void addToRecentModelList(String searchText) { + searchBySort(searchText); } public List getRecentModelList() {