yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-06-28 08:17:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化课程列表的分类+部门筛选过滤

Browse Source
This commit is contained in:
none 2023-03-09 10:37:40 +08:00
parent f6be76b851
commit 3388136fd7
5 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/xyz/playedu/api/controller/backend/CourseController.java
View File

@ -47,6 +47,7 @@ public class CourseController {
Integer size = MapUtils.getInteger(params, "size", 10);
String sortField = MapUtils.getString(params, "sort_field");
String sortAlgo = MapUtils.getString(params, "sort_algo");
String title = MapUtils.getString(params, "title");
String depIds = MapUtils.getString(params, "dep_ids");
String categoryIds = MapUtils.getString(params, "category_ids");
@ -55,14 +56,8 @@ public class CourseController {
filter.setTitle(title);
filter.setSortField(sortField);
filter.setSortAlgo(sortAlgo);
if (depIds != null && depIds.length() > 0) {
filter.setDepIds(Arrays.stream(depIds.split(",")).map(Integer::valueOf).toArray(Integer[]::new));
}
if (categoryIds != null && categoryIds.length() > 0) {
filter.setCategoryIds(Arrays.stream(categoryIds.split(",")).map(Integer::valueOf).toArray(Integer[]::new));
}
log.info("filter:" + filter);
filter.setCategoryIds(categoryIds);
filter.setDepIds(depIds);
PaginationResult<Course> result = courseService.paginate(page, size, filter);
return JsonResponse.data(result);

2
src/main/java/xyz/playedu/api/service/CourseDepartmentService.java
View File

@ -12,7 +12,7 @@ import java.util.List;
*/
public interface CourseDepartmentService extends IService<CourseDepartment> {
List<Integer> getCourseIdsByDepIds(Integer[] depIds);
List<Integer> getCourseIdsByDepIds(List<Integer> depIds);
List<Integer> getDepIdsByCourseId(Integer courseId);

22
src/main/java/xyz/playedu/api/service/impl/CourseDepartmentServiceImpl.java
View File

@ -18,29 +18,13 @@ import java.util.List;
public class CourseDepartmentServiceImpl extends ServiceImpl<CourseDepartmentMapper, CourseDepartment>
implements CourseDepartmentService {
@Override
public List<Integer> getCourseIdsByDepIds(Integer[] depIds) {
List<Integer> ids = new ArrayList<>();
List<CourseDepartment> courseDepartments = list(query().getWrapper().in("dep_id", depIds));
if (courseDepartments.size() == 0) {
return ids;
}
for (CourseDepartment courseDepartment : courseDepartments) {
ids.add(courseDepartment.getCourseId());
}
return ids;
public List<Integer> getCourseIdsByDepIds(List<Integer> depIds) {
return list(query().getWrapper().in("dep_id", depIds)).stream().map(CourseDepartment::getCourseId).toList();
}
@Override
public List<Integer> getDepIdsByCourseId(Integer courseId) {
List<Integer> ids = new ArrayList<>();
List<CourseDepartment> courseDepartments = list(query().getWrapper().eq("course_id", courseId));
if (courseDepartments.size() == 0) {
return ids;
}
for (CourseDepartment courseDepartment : courseDepartments) {
ids.add(courseDepartment.getDepId());
}
return ids;
return list(query().getWrapper().eq("course_id", courseId)).stream().map(CourseDepartment::getDepId).toList();
}
@Override

11
src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java
View File

@ -20,6 +20,7 @@ import xyz.playedu.api.types.paginate.PaginationResult;
import xyz.playedu.api.util.HelperUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@ -44,15 +45,17 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
if (filter.getTitle() != null && filter.getTitle().length() > 0) {
wrapper.like("title", "%" + filter.getTitle() + "%");
}
if (filter.getDepIds() != null && filter.getDepIds().length > 0) {
List<Integer> courseIds = courseDepartmentService.getCourseIdsByDepIds(filter.getDepIds());
if (filter.getDepIds() != null && filter.getDepIds().trim().length() > 0) {
List<Integer> depIds = Arrays.stream(filter.getDepIds().split(",")).map(Integer::valueOf).toList();
List<Integer> courseIds = courseDepartmentService.getCourseIdsByDepIds(depIds);
if (courseIds == null || courseIds.size() == 0) {
courseIds = HelperUtil.zeroIntegerList();
}
wrapper.in("id", courseIds);
}
if (filter.getCategoryIds() != null && filter.getCategoryIds().length > 0) {
List<Integer> courseIds = courseCategoryService.getCourseIdsByCategoryIds(List.of(filter.getCategoryIds()));
if (filter.getCategoryIds() != null && filter.getCategoryIds().trim().length() > 0) {
List<Integer> categoryIds = Arrays.stream(filter.getCategoryIds().split(",")).map(Integer::valueOf).toList();
List<Integer> courseIds = courseCategoryService.getCourseIdsByCategoryIds(categoryIds);
if (courseIds == null || courseIds.size() == 0) {
courseIds = HelperUtil.zeroIntegerList();
}

4
src/main/java/xyz/playedu/api/types/paginate/CoursePaginateFiler.java
View File

@ -11,9 +11,9 @@ public class CoursePaginateFiler {
private String title;
private Integer[] depIds;
private String depIds;
private Integer[] categoryIds;
private String categoryIds;
private String sortField;