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

课程附件列表查询

Browse Source
This commit is contained in:
wsw 2023-07-27 17:46:15 +08:00
parent 0da1c9d0d2
commit 3aa2ea9990
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/xyz/playedu/api/constant/BackendConstant.java
View File

@ -40,7 +40,7 @@ public class BackendConstant {
public static final String RESOURCE_TYPE_RAR = "RAR"; public static final String RESOURCE_TYPE_RAR = "RAR";
public static final String RESOURCE_TYPE_TXT = "TXT"; public static final String RESOURCE_TYPE_TXT = "TXT";
public static final String RESOURCE_TYPE_ANNEX = public static final String RESOURCE_TYPE_ATTACHMENT =
RESOURCE_TYPE_PDF +","+ RESOURCE_TYPE_TXT +","+ RESOURCE_TYPE_PDF +","+ RESOURCE_TYPE_TXT +","+
RESOURCE_TYPE_ZIP +","+ RESOURCE_TYPE_RAR +","+ RESOURCE_TYPE_ZIP +","+ RESOURCE_TYPE_RAR +","+
RESOURCE_TYPE_WORD +","+RESOURCE_TYPE_PPT +","+RESOURCE_TYPE_EXCEL; RESOURCE_TYPE_WORD +","+RESOURCE_TYPE_PPT +","+RESOURCE_TYPE_EXCEL;

2
src/main/java/xyz/playedu/api/controller/backend/ResourceController.java
View File

@ -111,7 +111,7 @@ public class ResourceController {
if(!type.equals(BackendConstant.RESOURCE_TYPE_VIDEO) && if(!type.equals(BackendConstant.RESOURCE_TYPE_VIDEO) &&
!type.equals(BackendConstant.RESOURCE_TYPE_IMAGE)){ !type.equals(BackendConstant.RESOURCE_TYPE_IMAGE)){
filter.setType(BackendConstant.RESOURCE_TYPE_ANNEX); filter.setType(BackendConstant.RESOURCE_TYPE_ATTACHMENT);
data.put("existingType",resourceService.paginateType(filter)); data.put("existingType",resourceService.paginateType(filter));
} }
return JsonResponse.data(data); return JsonResponse.data(data);

18
src/main/java/xyz/playedu/api/controller/frontend/CourseController.java
View File

@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import xyz.playedu.api.FCtx; import xyz.playedu.api.FCtx;
import xyz.playedu.api.constant.BackendConstant;
import xyz.playedu.api.domain.Course; import xyz.playedu.api.domain.Course;
import xyz.playedu.api.domain.CourseHour; import xyz.playedu.api.domain.CourseHour;
import xyz.playedu.api.domain.UserCourseHourRecord; import xyz.playedu.api.domain.UserCourseHourRecord;
@ -31,6 +32,7 @@ import xyz.playedu.api.types.paginate.CoursePaginateFiler;
import xyz.playedu.api.types.paginate.PaginationResult; import xyz.playedu.api.types.paginate.PaginationResult;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -42,6 +44,8 @@ import java.util.stream.Collectors;
@RequestMapping("/api/v1/course") @RequestMapping("/api/v1/course")
public class CourseController { public class CourseController {
@Autowired private ResourceService resourceService;
@Autowired private CourseService courseService; @Autowired private CourseService courseService;
@Autowired private CourseChapterService chapterService; @Autowired private CourseChapterService chapterService;
@ -72,19 +76,15 @@ public class CourseController {
public JsonResponse detail(@PathVariable(name = "id") Integer id) { public JsonResponse detail(@PathVariable(name = "id") Integer id) {
Course course = courseService.findOrFail(id); Course course = courseService.findOrFail(id);
List<CourseHour> courseHours = hourService.getHoursByCourseId(course.getId());
HashMap<String, Object> data = new HashMap<>(); HashMap<String, Object> data = new HashMap<>();
data.put("course", course); data.put("course", course);
data.put("chapters", chapterService.getChaptersByCourseId(course.getId())); data.put("chapters", chapterService.getChaptersByCourseId(course.getId()));
data.put( data.put("hours", courseHours.stream().collect(Collectors.groupingBy(CourseHour::getChapterId)));
"hours",
hourService.getHoursByCourseId(course.getId()).stream()
.collect(Collectors.groupingBy(CourseHour::getChapterId)));
data.put("learn_record", userCourseRecordService.find(FCtx.getId(), course.getId())); data.put("learn_record", userCourseRecordService.find(FCtx.getId(), course.getId()));
data.put( data.put("learn_hour_records", userCourseHourRecordService.getRecords(FCtx.getId(), course.getId()).stream().collect(Collectors.toMap(UserCourseHourRecord::getHourId, e -> e)));
"learn_hour_records", data.put("resource_attachments", resourceService.chunks(courseHours.stream().map(CourseHour::getRid).collect(Collectors.toList())).stream().filter(resource -> BackendConstant.RESOURCE_TYPE_ATTACHMENT.contains(resource.getType())).collect(Collectors.toList()));
userCourseHourRecordService.getRecords(FCtx.getId(), course.getId()).stream()
.collect(Collectors.toMap(UserCourseHourRecord::getHourId, e -> e)));
return JsonResponse.data(data); return JsonResponse.data(data);
} }
} }