mjh 4 лет назад
Родитель
Сommit
885ab57cc0

+ 3 - 3
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/MessageMapperImpl.java

@@ -69,7 +69,7 @@ public class MessageMapperImpl implements MessageMapper {
         if (optionalUser.isPresent()) {
             messageVO.setSender(userMapper.userToUserVO(optionalUser.get()));
         } else {
-            throw new PortalException(ExceptionType.ERROR, "消息发送者不存在!");
+            throw new PortalException(ExceptionType.ERROR, "消息发送者不存在");
         }
         messageVO.setActionType(message.getActionType());
         messageVO.setTargetType(message.getTargetType());
@@ -80,7 +80,7 @@ public class MessageMapperImpl implements MessageMapper {
                 if (optionalCourse.isPresent()) {
                     messageVO.setTarget(courseMapper.courseToCourseVO(optionalCourse.get()));
                 } else {
-                    throw new PortalException(ExceptionType.ERROR, "消息有关课程不存在!");
+                    throw new PortalException(ExceptionType.ERROR, "消息有关课程不存在");
                 }
                 break;
             case COMMENT:
@@ -90,7 +90,7 @@ public class MessageMapperImpl implements MessageMapper {
                 if(optionalAnnouncement.isPresent()){
                     messageVO.setTarget(announcementMapper.toAnnouncementVO(optionalAnnouncement.get()));
                 }else{
-                    throw new PortalException(ExceptionType.ERROR, "消息有关公告不存在!");
+                    throw new PortalException(ExceptionType.ERROR, "消息有关公告不存在");
                 }
                 break;
             default:

+ 9 - 9
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/AnnouncementService.java

@@ -32,14 +32,14 @@ public class AnnouncementService {
     public AnnouncementVO create(AnnouncementVO announcementVO) {
         Optional<User> sender = userRepository.findById(announcementVO.getSender().getId());
         if (!sender.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该公告发布者不存在!");
+            throw new PortalException(ExceptionType.ERROR, "该公告发布者不存在");
         }
         Optional<Course> course = courseRepository.findById(announcementVO.getCourse().getId());
         if (!course.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该课程不存在!");
+            throw new PortalException(ExceptionType.ERROR, "该课程不存在");
         }
         if (!sender.get().getId().equals(course.get().getTeacherId())) {
-            throw new PortalException(ExceptionType.ERROR, "公告发布者与课程老师不相同!");
+            throw new PortalException(ExceptionType.ERROR, "公告发布者与课程老师不相同");
         }
         Announcement announcement = announcementMapper.toAnnouncement(announcementVO);
         announcement.setState(ObjectState.NORMAL);
@@ -50,11 +50,11 @@ public class AnnouncementService {
     public String delete(Long id, Long userId) {
         Optional<Announcement> optionalAnnouncement = announcementRepository.findById(id);
         if (!optionalAnnouncement.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该公告不存在!");
+            throw new PortalException(ExceptionType.ERROR, "该公告不存在");
         }
         Announcement announcement = optionalAnnouncement.get();
         if (!announcement.getSenderId().equals(userId)) {
-            throw new PortalException(ExceptionType.ERROR, "当前角色无法删除该公告!");
+            throw new PortalException(ExceptionType.ERROR, "当前角色无法删除该公告");
         }
         announcement.setState(ObjectState.DELETED);
         announcementRepository.save(announcement);
@@ -64,14 +64,14 @@ public class AnnouncementService {
     public AnnouncementVO update(AnnouncementVO announcementVO) {
         Optional<Announcement> oldAnnouncement = announcementRepository.findById(announcementVO.getId());
         if (!oldAnnouncement.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "原公告不存在!");
+            throw new PortalException(ExceptionType.ERROR, "原公告不存在");
         }
         Optional<Course> course = courseRepository.findById(announcementVO.getCourse().getId());
         if (!course.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该课程不存在!");
+            throw new PortalException(ExceptionType.ERROR, "该课程不存在");
         }
         if (!announcementVO.getSender().getId().equals(course.get().getTeacherId())) {
-            throw new PortalException(ExceptionType.ERROR, "用户无权修改公告!");
+            throw new PortalException(ExceptionType.ERROR, "当前用户无权修改公告");
         }
         Announcement announcement = announcementMapper.toAnnouncement(announcementVO);
         Announcement result = announcementRepository.save(announcement);
@@ -81,7 +81,7 @@ public class AnnouncementService {
     public AnnouncementVO getAnnouncementById(Long id) {
         Optional<Announcement> announcement = announcementRepository.findById(id);
         if (!announcement.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该公告不存在!");
+            throw new PortalException(ExceptionType.ERROR, "该公告不存在");
         }
         return announcementMapper.toAnnouncementVO(announcement.get());
     }

+ 13 - 8
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseSelectionService.java

@@ -9,6 +9,7 @@ import cn.seecoder.seecoderportalserver.mapper.CourseSelectionMapper;
 import cn.seecoder.seecoderportalserver.repository.CourseRepository;
 import cn.seecoder.seecoderportalserver.repository.CourseSelectionRepository;
 import cn.seecoder.seecoderportalserver.repository.UserRepository;
+import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,9 +32,9 @@ public class CourseSelectionService {
 
     public String confirmCourseSelection(CourseSelectionVO courseSelectionVO) {
         Optional<User> user = userRepository.findById(courseSelectionVO.getUserId());
-        if (!user.isPresent()) return "用户不存在";
+        if (!user.isPresent()) throw new CustomErrorException("用户不存在");
         Optional<Course> course = courseRepository.findById(courseSelectionVO.getCourseId());
-        if (!course.isPresent()) return "课程不存在";
+        if (!course.isPresent()) throw new CustomErrorException("课程不存在");
         CourseSelection courseSelection = courseSelectionMapper.toCourseSelection(courseSelectionVO);
         courseSelection.setState(true);
         courseSelectionRepository.save(courseSelection);
@@ -41,19 +42,23 @@ public class CourseSelectionService {
     }
 
     public String cancelCourseSelection(CourseSelectionVO courseSelectionVO) {
-        Optional<User> user = userRepository.findById(courseSelectionVO.getUserId());
-        if (!user.isPresent()) return "用户不存在";
-        Optional<Course> course = courseRepository.findById(courseSelectionVO.getCourseId());
-        if (!course.isPresent()) return "课程不存在";
         CourseSelectionKey courseSelectionKey = courseSelectionMapper.toCourseSelectionKey(courseSelectionVO);
         Optional<CourseSelection> record = courseSelectionRepository.findById(courseSelectionKey);
-        if(record.isPresent()){
+        if(record.isPresent() && record.get().getState()){
             CourseSelection courseSelection = record.get();
             courseSelection.setState(false);
             courseSelectionRepository.save(courseSelection);
             return "选课记录已删除";
         }else{
-            return "选课记录不存在";
+            throw new CustomErrorException("选课记录不存在");
         }
     }
+
+    public Boolean checkSelection(Long userId, Long courseId){
+        CourseSelectionKey key = new CourseSelectionKey();
+        key.setUserId(userId);
+        key.setCourseId(courseId);
+        Optional<CourseSelection> record = courseSelectionRepository.findById(key);
+        return record.isPresent();
+    }
 }

+ 16 - 5
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -6,6 +6,7 @@ import cn.seecoder.seecoderportalcommon.vo.UserRole;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.CourseSelection;
 import cn.seecoder.seecoderportalserver.domain.User;
+import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import cn.seecoder.seecoderportalserver.web.rest.errors.ExceptionType;
 import cn.seecoder.seecoderportalserver.web.rest.errors.PortalException;
 import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
@@ -59,10 +60,10 @@ public class CourseService {
         // 确认授课老师
         Optional<User> teacher = userRepository.findById(courseVO.getTeacher().getId());
         if (!teacher.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该老师不存在");
+            throw new CustomErrorException("课程老师不存在");
         }
         if (!teacher.get().getRole().equals(UserRole.TEACHER) && !teacher.get().getRole().equals(UserRole.ADMIN)) {
-            throw new PortalException(ExceptionType.ERROR, "该老师不存在");
+            throw new CustomErrorException("仅限管理员和老师创建课程");
         }
 
         // 创建Coder课程
@@ -72,7 +73,7 @@ public class CourseService {
             coderId = (Integer) coderCourse.get("id");
             courseVO.setCoderId(coderId);
         } else {
-            throw new PortalException(ExceptionType.ERROR, "Coder: " + coderRes.get("msg"));
+            throw new CustomErrorException("Coder: " + coderRes.get("msg"));
         }
         Course course = courseMapper.courseVOToCourse(courseVO);
         course.setState(ObjectState.NORMAL);
@@ -81,18 +82,28 @@ public class CourseService {
     }
 
     public CourseVO updateCourse(CourseVO courseVO) {
+        Optional<Course> optionalCourse = courseRepository.findById(courseVO.getId());
+        if(!optionalCourse.isPresent()){
+            throw new CustomErrorException("原课程不存在");
+        }
+        if(!courseVO.getTeacher().getId().equals(optionalCourse.get().getTeacherId())){
+            throw new CustomErrorException("当前用户无权修改课程信息");
+        }
         Course course = courseMapper.courseVOToCourse(courseVO);
         Course result = courseRepository.save(course);
         return courseMapper.courseToCourseVO(result);
     }
 
     // 伪删除
-    public String deleteCourse(Long courseId) {
+    public String deleteCourse(Long courseId, Long userId) {
         Optional<Course> optionalCourse = courseRepository.findById(courseId);
         if (!optionalCourse.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该课程不存在!");
+            throw new CustomErrorException("原课程不存在");
         }
         Course course = optionalCourse.get();
+        if (!userId.equals(course.getTeacherId())){
+            throw new CustomErrorException("当前用户无权删除课程");
+        }
         course.setState(ObjectState.DELETED);
         courseRepository.save(course);
         return "课程删除成功";

+ 1 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/Impl/CoderService.java

@@ -57,7 +57,7 @@ public class CoderService implements SubsystemService {
         System.out.println(result);
     }
 
-    public JSONObject getAllExams(int page, int limit){
+    public JSONObject getExams(int page, int limit){
         String uri = "https://coder-server.seec.seecoder.cn/api/exam";
         String token = httpService.getToken();
         List<NameValuePair> params = new ArrayList<>();

+ 8 - 8
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/MessageService.java

@@ -53,10 +53,10 @@ public class MessageService {
     public MessageVO create(MessageVO messageVO) {
         Optional<User> sender = userRepository.findById(messageVO.getSender().getId());
         if (!sender.isPresent()) {
-            throw new CustomErrorException("消息发送者不存在!");
+            throw new CustomErrorException("消息发送者不存在");
         }
         if (!verifyTarget(messageVO.getTargetType(), messageVO.getTargetId())){
-            throw new CustomErrorException("消息目标不存在!");
+            throw new CustomErrorException("消息目标不存在");
         }
         Message message = messageMapper.toMessage(messageVO);
         Message result = messageRepository.save(message);
@@ -66,24 +66,24 @@ public class MessageService {
     public String delete(Long id, Long userId) {
         Optional<Message> optionalMessage = messageRepository.findById(id);
         if (!optionalMessage.isPresent()) {
-            throw new CustomErrorException("该消息不存在!");
+            throw new CustomErrorException("该消息不存在");
         }
         Message message = optionalMessage.get();
         if (!message.getSenderId().equals(userId)) {
-            throw new CustomErrorException("用户无权删除消息!");
+            throw new CustomErrorException("用户无权删除消息");
         }
         message.setState(ObjectState.DELETED);
         messageRepository.save(message);
-        return "消息删除成功!";
+        return "消息删除成功";
     }
 
     public MessageVO update(MessageVO messageVO) {
         Optional<Message> oldMessage = messageRepository.findById(messageVO.getId());
         if(!oldMessage.isPresent()){
-            throw new CustomErrorException("原消息不存在!");
+            throw new CustomErrorException("原消息不存在");
         }
         if (!verifyTarget(messageVO.getTargetType(), messageVO.getTargetId())){
-            throw new CustomErrorException("消息目标不存在!");
+            throw new CustomErrorException("消息目标不存在");
         }
         if(!oldMessage.get().getSenderId().equals(messageVO.getSender().getId())){
             throw new CustomErrorException("用户无权修改消息");
@@ -95,7 +95,7 @@ public class MessageService {
     public MessageVO getMessageById(Long id) {
         Optional<Message> optionalMessage = messageRepository.findById(id);
         if (!optionalMessage.isPresent()) {
-            throw new CustomErrorException("消息不存在!");
+            throw new CustomErrorException("消息不存在");
         }
         return messageMapper.toMessageVO(optionalMessage.get());
     }

+ 2 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/CoderController.java

@@ -16,7 +16,7 @@ public class CoderController {
     public CoderController(CoderService coderService) {this.coderService = coderService;}
 
     @GetMapping("/exams")
-    public OkResponse<JSONObject> getAllExams(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "100") int limit){
-        return OkResponse.of(coderService.getAllExams(page, limit));
+    public OkResponse<JSONObject> getExams(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "100") int limit){
+        return OkResponse.of(coderService.getExams(page, limit));
     }
 }

+ 4 - 4
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/CourseController.java

@@ -24,14 +24,14 @@ public class CourseController {
         return OkResponse.of(courseService.createCourse(courseVO));
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     public OkResponse<CourseVO> update(@RequestBody CourseVO courseVO) {
         return OkResponse.of(courseService.updateCourse(courseVO));
     }
 
-    @PostMapping("/delete")
-    public OkResponse<String> delete(@RequestBody Long courseId) {
-        return OkResponse.of(courseService.deleteCourse(courseId));
+    @DeleteMapping("/delete")
+    public OkResponse<String> delete(@RequestParam Long courseId, @RequestParam Long userId) {
+        return OkResponse.of(courseService.deleteCourse(courseId, userId));
     }
 
     @GetMapping("/all")

+ 6 - 4
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/CourseSelectionController.java

@@ -3,10 +3,7 @@ package cn.seecoder.seecoderportalserver.web.rest;
 import cn.seecoder.seecoderportalcommon.vo.CourseSelectionVO;
 import cn.seecoder.seecoderportalserver.service.CourseSelectionService;
 import cn.seecoder.seecoderportalserver.utility.OkResponse;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController()
 @RequestMapping("/api/course/selection")
@@ -24,4 +21,9 @@ public class CourseSelectionController {
     public OkResponse<String> cancel(@RequestBody CourseSelectionVO courseSelectionVO){
         return OkResponse.of(courseSelectionService.cancelCourseSelection(courseSelectionVO));
     }
+
+    @GetMapping("/checkSelection")
+    public OkResponse<Boolean> checkSelection(@RequestParam Long userId, @RequestParam Long courseId) {
+        return OkResponse.of(courseSelectionService.checkSelection(userId, courseId));
+    }
 }

+ 2 - 3
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/EvalController.java

@@ -24,9 +24,8 @@ public class EvalController {
     @GetMapping("/exams/student")
     public OkResponse<JSONObject> getStudentExams(@RequestParam(defaultValue = "100") int pageSize,
                                                   @RequestParam(defaultValue = "1") int pageNum,
-                                                  @ApiParam(name = "state", value = "0 所有, 1 未开始,2 进行中,3 已结束")
-                                                      @RequestParam(value = "state") int state
-    ){
+                                                  @RequestParam(value = "state") int state
+    ) {
         return OkResponse.of((JSONObject) evalService.getStudentExams(pageSize, pageNum, state).get("result"));
     }
 }