Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, 搜索中心 全文检索词频排序

See merge request LiuChao/foton-slrs-system-rest!503

adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java

@@ -1250,9 +1250,11 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         hiBuilder.preTags("<span class='highlight-class'>");
         hiBuilder.postTags("</span>");
         updateIndex("fulltextserch");
+        // _score 全文词频排序
         searchRequestBuilder = client.prepareSearch("fulltextserch")
                 .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
                 .highlighter(hiBuilder)
+                .addSort("_score",SortOrder.DESC)
                 .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
                 .setSize(searchInfoEO.getPageSize());
 
@@ -1613,18 +1615,11 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         hiBuilder.postTags("</span>");
 
         updateIndex("fulltextserch");
-        //1.按照资源库分类排序可实现数据的第一层排序（增加资源库自定义顺序标记，按标记排序）
-        //2.标准类别根据资源库分类基础上进行第二层排序（需提前维护标准类别的自定义顺序）
-        //3.标准编号则在标准类别的基础上进行第三层排序（此类排序针对国标、企标等规范类数据，海外标准由于历史数据不规范，可能会影响到检索的实际效果）
-        //4.标准年份为第四层排序规则
+        // _score 全文词频排序
         searchRequestBuilder = client.prepareSearch("fulltextserch")
                 .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
                 .highlighter(hiBuilder)
-                .addSort("standTypeOrder",SortOrder.ASC)
-                .addSort("standSortOrder",SortOrder.ASC)
-                .addSort("numberTitle",SortOrder.ASC)
-                .addSort("yearOrder",SortOrder.DESC)
-                .addSort("sortTitle.keyword",SortOrder.ASC)
+                .addSort("_score",SortOrder.DESC)
                 .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize())
                 .setSize(searchInfoEO.getPageSize());