架构功能升级

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/api/biz/ApiCourseBiz.java

@@ -30,6 +30,8 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.MultiMatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.elasticsearch.search.sort.FieldSortBuilder;
+import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.PageRequest;
@@ -72,9 +74,6 @@ public class ApiCourseBiz extends BaseBiz {
         NativeSearchQueryBuilder nsb = new NativeSearchQueryBuilder();
         // 高亮字段
         nsb.withHighlightFields(new HighlightBuilder.Field("courseName").preTags("<mark>").postTags("</mark>"));
-        // 课程排序（courseSort）
-        //nsb.withSort(new FieldSortBuilder("courseSort").order(SortOrder.ASC));
-        //nsb.withSort(new FieldSortBuilder("id").order(SortOrder.DESC));
 
         // 分页
         nsb.withPageable(PageRequest.of(req.getPageCurrent() - 1, req.getPageSize()));
@@ -89,6 +88,10 @@ public class ApiCourseBiz extends BaseBiz {
         if (StringUtils.hasText(req.getCourseName())) {
             // 模糊查询multiMatchQuery，最佳字段best_fields
             qb.must(QueryBuilders.multiMatchQuery(req.getCourseName(), "courseName").type(MultiMatchQueryBuilder.Type.BEST_FIELDS));
+        }else{
+            // 课程排序（courseSort）
+            nsb.withSort(new FieldSortBuilder("courseSort").order(SortOrder.ASC));
+            nsb.withSort(new FieldSortBuilder("id").order(SortOrder.DESC));
         }
         nsb.withQuery(qb);