hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-16 22:36:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/baseservers into stat

Browse Source
This commit is contained in:
daihh
2022-11-01 17:09:50 +08:00
parent 913c1740e9 dec2e7f8eb
commit 48ffd4be1c
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
View File

@@ -109,11 +109,14 @@ public class CoursePortalApi extends ApiBaseController{
* 评分榜 * 评分榜
* */ * */
@GetMapping("/score-list") @GetMapping("/score-list")
public JsonResponse<List<RankingDto>> scoreList(Integer num){ public JsonResponse<List<RankingDto>> scoreList(Integer num,Integer index){
if(num==null){ if(num==null){
num=5; num=5;
} }
List<RankingDto> rankingDtos = courseService.scoreList(num); if(index==null){
return badRequest("缺少参数");
}
List<RankingDto> rankingDtos = courseService.scoreList(num,index);
return success(rankingDtos); return success(rankingDtos);
} }

2
servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
View File

@@ -274,7 +274,7 @@ public interface ICourseService {
/** /**
* 评分榜 * 评分榜
* */ * */
List<RankingDto> scoreList(int num); List<RankingDto> scoreList(int num,int index);
/** /**
* 判断课程名字是否有重复 * 判断课程名字是否有重复

9
servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
View File

@@ -896,7 +896,7 @@ public class CourseServiceImpl implements ICourseService {
@Override @Override
public List<RankingDto> scoreList(int num) { public List<RankingDto> scoreList(int num,int index) {
QueryBuilder builder = QueryBuilder.from(Course.class); QueryBuilder builder = QueryBuilder.from(Course.class);
builder.setPageSize(num); builder.setPageSize(num);
builder.addFilter(FieldFilters.eq("deleted",false)); builder.addFilter(FieldFilters.eq("deleted",false));
@@ -905,7 +905,12 @@ public class CourseServiceImpl implements ICourseService {
builder.addFilter(FieldFilters.eq("enabled",true)); builder.addFilter(FieldFilters.eq("enabled",true));
LocalDateTime parse = LocalDate.parse("2022-01-01", DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay(); LocalDateTime parse = LocalDate.parse("2022-01-01", DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay();
builder.addFilter(FieldFilters.gt("publishTime",parse)); 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<Course> page = courseDao.findPage(builder.builder()); PageList<Course> page = courseDao.findPage(builder.builder());
List<Course> list = page.getList(); List<Course> list = page.getList();
List<RankingDto> rankingDtos = new ArrayList<>(); List<RankingDto> rankingDtos = new ArrayList<>();

2
servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java
View File

@@ -138,7 +138,7 @@ public class PortalIndexApi extends ApiBaseController{
int i=0; int i=0;
if(!courses.isEmpty()){ if(!courses.isEmpty()){
for (Course c:courses) { for (Course c:courses) {
coursePageList.getList().set(i,c); coursePageList.getList().add(i,c);
i++; i++;
} }
} }