diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java index 485c8d1b..365f3b1e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java @@ -109,11 +109,14 @@ public class CoursePortalApi extends ApiBaseController{ * 评分榜 * */ @GetMapping("/score-list") - public JsonResponse> scoreList(Integer num){ + public JsonResponse> scoreList(Integer num,Integer index){ if(num==null){ num=5; } - List rankingDtos = courseService.scoreList(num); + if(index==null){ + return badRequest("缺少参数"); + } + List rankingDtos = courseService.scoreList(num,index); return success(rankingDtos); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java index 6ddf3b53..09d29ce2 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java @@ -274,7 +274,7 @@ public interface ICourseService { /** * 评分榜 * */ - List scoreList(int num); + List scoreList(int num,int index); /** * 判断课程名字是否有重复 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 3c0e84c8..2592059c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -896,7 +896,7 @@ public class CourseServiceImpl implements ICourseService { @Override - public List scoreList(int num) { + public List scoreList(int num,int index) { QueryBuilder builder = QueryBuilder.from(Course.class); builder.setPageSize(num); builder.addFilter(FieldFilters.eq("deleted",false)); @@ -905,7 +905,12 @@ public class CourseServiceImpl implements ICourseService { builder.addFilter(FieldFilters.eq("enabled",true)); LocalDateTime parse = LocalDate.parse("2022-01-01", DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay(); builder.addFilter(FieldFilters.gt("publishTime",parse)); - builder.addOrder(OrderCondition.desc("score")); + if(index==1){ + builder.addOrder(OrderCondition.desc("views")); + }else { + builder.addOrder(OrderCondition.desc("score")); + } + PageList page = courseDao.findPage(builder.builder()); List list = page.getList(); List rankingDtos = new ArrayList<>(); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java index 3602a931..a55dff47 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java @@ -138,7 +138,7 @@ public class PortalIndexApi extends ApiBaseController{ int i=0; if(!courses.isEmpty()){ for (Course c:courses) { - coursePageList.getList().set(i,c); + coursePageList.getList().add(i,c); i++; } }