线上课-学员api重构

This commit is contained in:
none 2023-05-08 11:13:25 +08:00
parent 2bb9e7491b
commit b4bcb74e46

View File

@ -22,19 +22,22 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import xyz.playedu.api.constant.BPermissionConstant;
import xyz.playedu.api.domain.User;
import xyz.playedu.api.domain.UserCourseRecord;
import xyz.playedu.api.event.UserCourseRecordDestroyEvent;
import xyz.playedu.api.middleware.BackendPermissionMiddleware;
import xyz.playedu.api.request.backend.CourseUserDestroyRequest;
import xyz.playedu.api.service.CourseService;
import xyz.playedu.api.service.UserCourseRecordService;
import xyz.playedu.api.service.UserService;
import xyz.playedu.api.types.JsonResponse;
import xyz.playedu.api.types.paginate.PaginationResult;
import xyz.playedu.api.types.paginate.UserCourseRecordPaginateFilter;
import xyz.playedu.api.types.paginate.UserPaginateFilter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author 杭州白书科技有限公司
@ -45,6 +48,8 @@ import java.util.List;
@RequestMapping("/backend/v1/course/{courseId}/user")
public class CourseUserController {
@Autowired private CourseService courseService;
@Autowired private UserCourseRecordService userCourseRecordService;
@Autowired private UserService userService;
@ -64,24 +69,34 @@ public class CourseUserController {
String email = MapUtils.getString(params, "email");
String idCard = MapUtils.getString(params, "id_card");
UserCourseRecordPaginateFilter filter = new UserCourseRecordPaginateFilter();
filter.setCourseId(courseId);
UserPaginateFilter filter = new UserPaginateFilter();
filter.setName(name);
filter.setEmail(email);
filter.setIdCard(idCard);
filter.setSortAlgo(sortAlgo);
filter.setSortField(sortField);
filter.setIdCard(idCard);
PaginationResult<UserCourseRecord> result =
userCourseRecordService.paginate(page, size, filter);
// 所属部门
List<Integer> depIds = courseService.getDepIdsByCourseId(courseId);
if (depIds != null && depIds.size() > 0) {
filter.setDepIds(
depIds.stream().map(String::valueOf).collect(Collectors.joining(",", "", "")));
}
PaginationResult<User> result = userService.paginate(page, size, filter);
HashMap<String, Object> data = new HashMap<>();
data.put("data", result.getData());
data.put("total", result.getTotal());
data.put(
"users",
userService.chunks(
result.getData().stream().map(UserCourseRecord::getUserId).toList()));
"user_course_records",
userCourseRecordService.chunk(
result.getData().stream().map(User::getId).toList(),
new ArrayList<>() {
{
add(courseId);
}
}));
return JsonResponse.data(data);
}