|
|
@@ -1,9 +1,7 @@
|
|
|
package nju.seec.helper.controller;
|
|
|
|
|
|
import nju.seec.helper.aspect.auth.Auth;
|
|
|
-import nju.seec.helper.controller.response.EmptyResponse;
|
|
|
-import nju.seec.helper.controller.response.PageResourceResponse;
|
|
|
-import nju.seec.helper.controller.response.ResourceResponse;
|
|
|
+import nju.seec.helper.controller.response.PageResponse;
|
|
|
import nju.seec.helper.dto.LoginUser;
|
|
|
import nju.seec.helper.dto.SlideDTO;
|
|
|
import nju.seec.helper.dto.modify.ModifySlideDTO;
|
|
|
@@ -13,10 +11,10 @@ import nju.seec.helper.util.enums.UserType;
|
|
|
import nju.seec.helper.vo.SlideVO;
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
import org.springframework.data.web.PageableDefault;
|
|
|
+import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
-import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* 幻灯片
|
|
|
@@ -37,10 +35,10 @@ public class SlideController {
|
|
|
*/
|
|
|
@Auth(roles = UserType.TEACHER, message = "创建幻灯片")
|
|
|
@PostMapping
|
|
|
- public ResourceResponse<SlideVO> createSlide(LoginUser user,
|
|
|
- @Valid SlideDTO slideDTO) {
|
|
|
+ public ResponseEntity<SlideVO> createSlide(LoginUser user,
|
|
|
+ @Valid SlideDTO slideDTO) {
|
|
|
SlideVO slideVO = slideService.createSlide(user, slideDTO);
|
|
|
- return ResourceResponse.of(slideVO);
|
|
|
+ return ResponseEntity.ok(slideVO);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -48,10 +46,9 @@ public class SlideController {
|
|
|
*/
|
|
|
@Auth(roles = UserType.TEACHER, message = "修改幻灯片")
|
|
|
@PutMapping
|
|
|
- public ResourceResponse<SlideVO> modifySlide(LoginUser user,
|
|
|
- @Valid @RequestBody ModifySlideDTO modifySlideDTO) {
|
|
|
- SlideVO slideVO = slideService.modifySlide(user, modifySlideDTO);
|
|
|
- return ResourceResponse.of(slideVO);
|
|
|
+ public SlideVO modifySlide(LoginUser user,
|
|
|
+ @Valid @RequestBody ModifySlideDTO modifySlideDTO) {
|
|
|
+ return slideService.modifySlide(user, modifySlideDTO);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -59,10 +56,9 @@ public class SlideController {
|
|
|
*/
|
|
|
@Auth(roles = UserType.TEACHER, message = "修改幻灯片状态")
|
|
|
@PutMapping("/state")
|
|
|
- public EmptyResponse modifySlideState(LoginUser user,
|
|
|
- @Valid @RequestBody ModifySlideStateDTO modifySlideStateDTO) {
|
|
|
+ public void modifySlideState(LoginUser user,
|
|
|
+ @Valid @RequestBody ModifySlideStateDTO modifySlideStateDTO) {
|
|
|
slideService.modifySlideState(user, modifySlideStateDTO);
|
|
|
- return EmptyResponse.getInstance();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -70,10 +66,9 @@ public class SlideController {
|
|
|
*/
|
|
|
@Auth(roles = UserType.TEACHER, message = "删除幻灯片")
|
|
|
@DeleteMapping("/{slideId}")
|
|
|
- public EmptyResponse removeSlide(LoginUser user,
|
|
|
- @PathVariable Integer slideId) {
|
|
|
+ public void removeSlide(LoginUser user,
|
|
|
+ @PathVariable Integer slideId) {
|
|
|
slideService.removeSlide(user, slideId);
|
|
|
- return EmptyResponse.getInstance();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -81,11 +76,10 @@ public class SlideController {
|
|
|
*/
|
|
|
@Auth(roles = UserType.TEACHER, message = "获取幻灯片列表")
|
|
|
@GetMapping("/teacher")
|
|
|
- public PageResourceResponse<SlideVO> teacherGetSlides(LoginUser user,
|
|
|
- @RequestParam(required = false, defaultValue = "") String key,
|
|
|
- @PageableDefault(size = Integer.MAX_VALUE) Pageable pageable) {
|
|
|
- List<SlideVO> slideVOList = slideService.teacherGetSlides(user, key, pageable);
|
|
|
- return PageResourceResponse.of(slideVOList, pageable.getPageNumber(), pageable.getPageSize());
|
|
|
+ public PageResponse<SlideVO> teacherGetSlides(LoginUser user,
|
|
|
+ @RequestParam(required = false, defaultValue = "") String key,
|
|
|
+ @PageableDefault(size = Integer.MAX_VALUE) Pageable pageable) {
|
|
|
+ return PageResponse.of(slideService.teacherGetSlides(user, key, pageable));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -93,12 +87,11 @@ public class SlideController {
|
|
|
*/
|
|
|
@Auth(roles = UserType.TEACHER, message = "获取幻灯片列表")
|
|
|
@GetMapping("/teacher/course/{courseId}")
|
|
|
- public PageResourceResponse<SlideVO> teacherGetSlidesByCourse(LoginUser user,
|
|
|
- @PathVariable Integer courseId,
|
|
|
- @RequestParam(required = false, defaultValue = "") String key,
|
|
|
- @PageableDefault(size = Integer.MAX_VALUE) Pageable pageable) {
|
|
|
- List<SlideVO> slideVOList = slideService.teacherGetSlidesByCourse(user, courseId, key, pageable);
|
|
|
- return PageResourceResponse.of(slideVOList, pageable.getPageNumber(), pageable.getPageSize());
|
|
|
+ public PageResponse<SlideVO> teacherGetSlidesByCourse(LoginUser user,
|
|
|
+ @PathVariable Integer courseId,
|
|
|
+ @RequestParam(required = false, defaultValue = "") String key,
|
|
|
+ @PageableDefault(size = Integer.MAX_VALUE) Pageable pageable) {
|
|
|
+ return PageResponse.of(slideService.teacherGetSlidesByCourse(user, courseId, key, pageable));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -106,12 +99,11 @@ public class SlideController {
|
|
|
*/
|
|
|
@Auth(roles = UserType.STUDENT, message = "获取幻灯片列表")
|
|
|
@GetMapping("/student/course/{courseId}")
|
|
|
- public PageResourceResponse<SlideVO> studentGetSlidesByCourse(LoginUser user,
|
|
|
- @PathVariable Integer courseId,
|
|
|
- @RequestParam(required = false, defaultValue = "") String key,
|
|
|
- @PageableDefault(size = Integer.MAX_VALUE) Pageable pageable) {
|
|
|
- List<SlideVO> slideVOList = slideService.studentGetSlidesByCourse(user, courseId, key, pageable);
|
|
|
- return PageResourceResponse.of(slideVOList, pageable.getPageNumber(), pageable.getPageSize());
|
|
|
+ public PageResponse<SlideVO> studentGetSlidesByCourse(LoginUser user,
|
|
|
+ @PathVariable Integer courseId,
|
|
|
+ @RequestParam(required = false, defaultValue = "") String key,
|
|
|
+ @PageableDefault(size = Integer.MAX_VALUE) Pageable pageable) {
|
|
|
+ return PageResponse.of(slideService.studentGetSlidesByCourse(user, courseId, key, pageable));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -119,9 +111,8 @@ public class SlideController {
|
|
|
*/
|
|
|
@Auth(roles = {UserType.TEACHER, UserType.STUDENT}, message = "获取幻灯片链接")
|
|
|
@GetMapping("/{slideId}/url")
|
|
|
- public ResourceResponse<String> getSlideUrl(LoginUser user,
|
|
|
- @PathVariable Integer slideId) {
|
|
|
- String slideUrl = slideService.getSlideUrl(user, slideId);
|
|
|
- return ResourceResponse.of(slideUrl);
|
|
|
+ public String getSlideUrl(LoginUser user,
|
|
|
+ @PathVariable Integer slideId) {
|
|
|
+ return slideService.getSlideUrl(user, slideId);
|
|
|
}
|
|
|
}
|