Переглянути джерело

feat: 公告的简单增删改查,以及将CourseState改为ObjectState以便复用

mjh 4 роки тому
батько
коміт
28b396e89e
14 змінених файлів з 541 додано та 42 видалено
  1. 88 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/AnnouncementVO.java
  2. 0 10
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/CourseState.java
  3. 6 6
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/CourseVO.java
  4. 14 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/ObjectState.java
  5. 108 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Announcement.java
  6. 92 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/AnnouncementRecord.java
  7. 7 7
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Course.java
  8. 10 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/AnnouncementMapper.java
  9. 67 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/AnnouncementMapperImpl.java
  10. 2 2
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/CourseMapperImpl.java
  11. 7 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/AnnouncementRepository.java
  12. 92 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/AnnouncementService.java
  13. 14 17
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java
  14. 34 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/AnnouncementController.java

+ 88 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/AnnouncementVO.java

@@ -0,0 +1,88 @@
+package cn.seecoder.seecoderportalcommon.vo;
+
+import java.time.OffsetDateTime;
+
+public class AnnouncementVO {
+    private Long id;
+
+    private UserVO sender;
+
+    private CourseVO course;
+
+    private String title;
+
+    private String content;
+
+    private OffsetDateTime createAt;
+
+    private ObjectState state;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public UserVO getSender() {
+        return sender;
+    }
+
+    public void setSender(UserVO sender) {
+        this.sender = sender;
+    }
+
+    public CourseVO getCourse() {
+        return course;
+    }
+
+    public void setCourse(CourseVO course) {
+        this.course = course;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public OffsetDateTime getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(OffsetDateTime createAt) {
+        this.createAt = createAt;
+    }
+
+    public ObjectState getState() {
+        return state;
+    }
+
+    public void setState(ObjectState state) {
+        this.state = state;
+    }
+
+    @Override
+    public String toString() {
+        return "AnnouncementVO{" +
+                "id=" + id +
+                ", sender=" + sender +
+                ", course=" + course +
+                ", title='" + title + '\'' +
+                ", content='" + content + '\'' +
+                ", createAt=" + createAt +
+                ", state=" + state +
+                '}';
+    }
+}

+ 0 - 10
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/CourseState.java

@@ -1,10 +0,0 @@
-package cn.seecoder.seecoderportalcommon.vo;
-
-public enum CourseState {
-    NORMAL("NORMAL"),
-    DELETED("DELETED");
-
-    private final String state;
-
-    CourseState(String state) {this.state = state;}
-}

+ 6 - 6
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/CourseVO.java

@@ -33,7 +33,7 @@ public class CourseVO {
 
     private Double price;
 
-    private CourseState courseState;
+    private ObjectState state;
 
     public Long getId() {
         return id;
@@ -131,12 +131,12 @@ public class CourseVO {
         this.helperId = helperId;
     }
 
-    public CourseState getCourseState() {
-        return courseState;
+    public ObjectState getState() {
+        return state;
     }
 
-    public void setCourseState(CourseState courseState) {
-        this.courseState = courseState;
+    public void setState(ObjectState state) {
+        this.state = state;
     }
 
     public UserVO getTeacher() {
@@ -181,7 +181,7 @@ public class CourseVO {
                 ", helperId=" + helperId +
                 ", createdTime=" + createdTime +
                 ", price=" + price +
-                ", courseState=" + courseState +
+                ", courseState=" + state +
                 '}';
     }
 }

+ 14 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/ObjectState.java

@@ -0,0 +1,14 @@
+package cn.seecoder.seecoderportalcommon.vo;
+
+public enum ObjectState {
+    NORMAL("NORMAL"),
+    DELETED("DELETED");
+
+    private final String state;
+
+    ObjectState(String state) {this.state = state;}
+
+    public String getState() {
+        return state;
+    }
+}

+ 108 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Announcement.java

@@ -0,0 +1,108 @@
+package cn.seecoder.seecoderportalserver.domain;
+
+import cn.seecoder.seecoderportalcommon.vo.ObjectState;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.time.OffsetDateTime;
+
+@Entity
+@Table(name = "announcement")
+public class Announcement {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @Column
+    @NotNull
+    private Long senderId;
+
+    @Column
+    @NotNull
+    private Long courseId;
+
+    @Column
+    @NotNull
+    private String title;
+
+    @Column
+    @NotNull
+    private String content;
+
+    @Column
+    @NotNull
+    private OffsetDateTime createAt;
+
+    @Column
+    @NotNull
+    private ObjectState state;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSenderId() {
+        return senderId;
+    }
+
+    public void setSenderId(Long senderId) {
+        this.senderId = senderId;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public OffsetDateTime getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(OffsetDateTime createdAt) {
+        this.createAt = createdAt;
+    }
+
+    public ObjectState getState() {
+        return state;
+    }
+
+    public void setState(ObjectState state) {
+        this.state = state;
+    }
+
+    @Override
+    public String toString() {
+        return "Announcement{" +
+                "id=" + id +
+                ", senderId=" + senderId +
+                ", courseId=" + courseId +
+                ", title='" + title + '\'' +
+                ", content='" + content + '\'' +
+                ", createdAt=" + createAt +
+                ", state=" + state +
+                '}';
+    }
+}

+ 92 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/AnnouncementRecord.java

@@ -0,0 +1,92 @@
+package cn.seecoder.seecoderportalserver.domain;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.time.OffsetDateTime;
+
+@Entity
+@Table(name = "announcement_record")
+public class AnnouncementRecord {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @Column
+    @NotNull
+    private Long announcementId;
+
+    @Column
+    @NotNull
+    private Long recipientId;
+
+    @Column
+    @NotNull
+    private OffsetDateTime createdAt;
+
+    @Column
+    @NotNull
+    private Boolean state;
+
+    @Column
+    private OffsetDateTime readAt;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getAnnouncementId() {
+        return announcementId;
+    }
+
+    public void setAnnouncementId(Long announcementId) {
+        this.announcementId = announcementId;
+    }
+
+    public Long getRecipientId() {
+        return recipientId;
+    }
+
+    public void setRecipientId(Long recipientId) {
+        this.recipientId = recipientId;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Boolean getState() {
+        return state;
+    }
+
+    public void setState(Boolean state) {
+        this.state = state;
+    }
+
+    public OffsetDateTime getReadAt() {
+        return readAt;
+    }
+
+    public void setReadAt(OffsetDateTime readAt) {
+        this.readAt = readAt;
+    }
+
+    @Override
+    public String toString() {
+        return "AnnouncementRecord{" +
+                "id=" + id +
+                ", announcementId=" + announcementId +
+                ", recipientId=" + recipientId +
+                ", createdAt=" + createdAt +
+                ", state=" + state +
+                ", readAt=" + readAt +
+                '}';
+    }
+}

+ 7 - 7
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Course.java

@@ -1,6 +1,6 @@
 package cn.seecoder.seecoderportalserver.domain;
 
-import cn.seecoder.seecoderportalcommon.vo.CourseState;
+import cn.seecoder.seecoderportalcommon.vo.ObjectState;
 import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
@@ -81,7 +81,7 @@ public class Course {
     @Column
     @Enumerated(EnumType.STRING)
     @NotNull
-    private CourseState courseState;
+    private ObjectState state;
 
     public Long getId() {
         return id;
@@ -187,12 +187,12 @@ public class Course {
         this.helperId = helperId;
     }
 
-    public CourseState getCourseState() {
-        return courseState;
+    public ObjectState getState() {
+        return state;
     }
 
-    public void setCourseState(CourseState courseState) {
-        this.courseState = courseState;
+    public void setState(ObjectState state) {
+        this.state = state;
     }
 
     public OffsetDateTime getCreatedTime() {
@@ -229,7 +229,7 @@ public class Course {
                 ", helperId=" + helperId +
                 ", createdTime=" + createdTime +
                 ", price=" + price +
-                ", courseState=" + courseState +
+                ", courseState=" + state +
                 '}';
     }
 }

+ 10 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/AnnouncementMapper.java

@@ -0,0 +1,10 @@
+package cn.seecoder.seecoderportalserver.mapper;
+
+import cn.seecoder.seecoderportalcommon.vo.AnnouncementVO;
+import cn.seecoder.seecoderportalserver.domain.Announcement;
+
+public interface AnnouncementMapper {
+    AnnouncementVO toAnnouncementVO(Announcement announcement);
+
+    Announcement toAnnouncement(AnnouncementVO announcementVO);
+}

+ 67 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/AnnouncementMapperImpl.java

@@ -0,0 +1,67 @@
+package cn.seecoder.seecoderportalserver.mapper.impl;
+
+import cn.seecoder.seecoderportalcommon.vo.AnnouncementVO;
+import cn.seecoder.seecoderportalserver.domain.Announcement;
+import cn.seecoder.seecoderportalserver.domain.Course;
+import cn.seecoder.seecoderportalserver.domain.User;
+import cn.seecoder.seecoderportalserver.mapper.AnnouncementMapper;
+import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
+import cn.seecoder.seecoderportalserver.mapper.UserMapper;
+import cn.seecoder.seecoderportalserver.repository.CourseRepository;
+import cn.seecoder.seecoderportalserver.repository.UserRepository;
+import org.springframework.stereotype.Component;
+
+import java.util.Optional;
+
+@Component
+public class AnnouncementMapperImpl implements AnnouncementMapper {
+    private final UserRepository userRepository;
+    private final UserMapper userMapper;
+    private final CourseRepository courseRepository;
+    private final CourseMapper courseMapper;
+
+    public AnnouncementMapperImpl(UserRepository userRepository, UserMapper userMapper, CourseRepository courseRepository, CourseMapper courseMapper) {
+        this.userRepository = userRepository;
+        this.userMapper = userMapper;
+        this.courseRepository = courseRepository;
+        this.courseMapper = courseMapper;
+    }
+
+    @Override
+    public AnnouncementVO toAnnouncementVO(Announcement announcement) {
+        if (announcement == null) {
+            return null;
+        }
+
+        AnnouncementVO announcementVO = new AnnouncementVO();
+
+        announcementVO.setId(announcement.getId());
+        Optional<User> sender = userRepository.findById(announcement.getSenderId());
+        sender.ifPresent(user -> announcementVO.setSender(userMapper.userToUserVO(user)));
+        Optional<Course> course = courseRepository.findById(announcement.getCourseId());
+        course.ifPresent(course1 -> announcementVO.setCourse(courseMapper.courseToCourseVO(course1)));
+        announcementVO.setTitle(announcement.getTitle());
+        announcementVO.setContent(announcement.getContent());
+        announcementVO.setCreateAt(announcement.getCreateAt());
+        announcementVO.setState(announcement.getState());
+        return announcementVO;
+    }
+
+    @Override
+    public Announcement toAnnouncement(AnnouncementVO announcementVO) {
+        if (announcementVO == null) {
+            return null;
+        }
+
+        Announcement announcement = new Announcement();
+
+        announcement.setId(announcementVO.getId());
+        announcement.setSenderId(announcementVO.getSender().getId());
+        announcement.setCourseId(announcementVO.getCourse().getId());
+        announcement.setTitle(announcementVO.getTitle());
+        announcement.setContent(announcementVO.getContent());
+        announcement.setCreateAt(announcementVO.getCreateAt());
+        announcement.setState(announcementVO.getState());
+        return announcement;
+    }
+}

+ 2 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/CourseMapperImpl.java

@@ -44,7 +44,7 @@ public class CourseMapperImpl implements CourseMapper {
         courseVO.setHelperId(course.getHelperId());
         courseVO.setCreatedTime(course.getCreatedTime());
         courseVO.setPrice(course.getPrice());
-        courseVO.setCourseState(course.getCourseState());
+        courseVO.setState(course.getState());
 
         return courseVO;
     }
@@ -72,7 +72,7 @@ public class CourseMapperImpl implements CourseMapper {
         course.setHelperId(courseVO.getHelperId());
         course.setCreatedTime(courseVO.getCreatedTime());
         course.setPrice(courseVO.getPrice());
-        course.setCourseState(courseVO.getCourseState());
+        course.setState(courseVO.getState());
 
         return course;
     }

+ 7 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/AnnouncementRepository.java

@@ -0,0 +1,7 @@
+package cn.seecoder.seecoderportalserver.repository;
+
+import cn.seecoder.seecoderportalserver.domain.Announcement;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface AnnouncementRepository extends JpaRepository<Announcement, Long> {
+}

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

@@ -0,0 +1,92 @@
+package cn.seecoder.seecoderportalserver.service;
+
+import cn.seecoder.seecoderportalcommon.vo.AnnouncementVO;
+import cn.seecoder.seecoderportalcommon.vo.ObjectState;
+import cn.seecoder.seecoderportalserver.domain.Announcement;
+import cn.seecoder.seecoderportalserver.domain.Course;
+import cn.seecoder.seecoderportalserver.domain.User;
+import cn.seecoder.seecoderportalserver.exception.ExceptionType;
+import cn.seecoder.seecoderportalserver.exception.PortalException;
+import cn.seecoder.seecoderportalserver.mapper.AnnouncementMapper;
+import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
+import cn.seecoder.seecoderportalserver.repository.CourseRepository;
+import cn.seecoder.seecoderportalserver.repository.UserRepository;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+public class AnnouncementService {
+    private final AnnouncementRepository announcementRepository;
+    private final AnnouncementMapper announcementMapper;
+    private final CourseRepository courseRepository;
+    private final UserRepository userRepository;
+
+    public AnnouncementService(AnnouncementRepository announcementRepository, AnnouncementMapper announcementMapper, CourseRepository courseRepository, UserRepository userRepository) {
+        this.announcementRepository = announcementRepository;
+        this.announcementMapper = announcementMapper;
+        this.courseRepository = courseRepository;
+        this.userRepository = userRepository;
+    }
+
+    public AnnouncementVO create(AnnouncementVO announcementVO) {
+        Optional<User> sender = userRepository.findById(announcementVO.getSender().getId());
+        if (!sender.isPresent()) {
+            throw new PortalException(ExceptionType.ERROR, "该公告发布者不存在!");
+        }
+        Optional<Course> course = courseRepository.findById(announcementVO.getCourse().getId());
+        if (!course.isPresent()) {
+            throw new PortalException(ExceptionType.ERROR, "该课程不存在!");
+        }
+        if (!sender.get().getId().equals(course.get().getTeacherId())) {
+            throw new PortalException(ExceptionType.ERROR, "公告发布者与课程老师不相同!");
+        }
+        Announcement announcement = announcementMapper.toAnnouncement(announcementVO);
+        announcement.setState(ObjectState.NORMAL);
+        Announcement result = announcementRepository.save(announcement);
+        return announcementMapper.toAnnouncementVO(result);
+    }
+
+    public String delete(Long id, Long u) {
+        Optional<Announcement> optionalAnnouncement = announcementRepository.findById(id);
+        if (!optionalAnnouncement.isPresent()) {
+            throw new PortalException(ExceptionType.ERROR, "该公告不存在!");
+        }
+        Announcement announcement = optionalAnnouncement.get();
+        if (!announcement.getSenderId().equals(u)) {
+            throw new PortalException(ExceptionType.ERROR, "当前角色无法删除该公告!");
+        }
+        announcement.setState(ObjectState.DELETED);
+        announcementRepository.save(announcement);
+        return "公告删除完成。";
+    }
+
+    public AnnouncementVO update(AnnouncementVO announcementVO) {
+        Optional<Announcement> oldAnnouncement = announcementRepository.findById(announcementVO.getId());
+        if (!oldAnnouncement.isPresent()) {
+            throw new PortalException(ExceptionType.ERROR, "原公告不存在!");
+        }
+        Optional<User> sender = userRepository.findById(announcementVO.getSender().getId());
+        if (!sender.isPresent()) {
+            throw new PortalException(ExceptionType.ERROR, "该公告修改者不存在!");
+        }
+        Optional<Course> course = courseRepository.findById(announcementVO.getCourse().getId());
+        if (!course.isPresent()) {
+            throw new PortalException(ExceptionType.ERROR, "该课程不存在!");
+        }
+        if (!sender.get().getId().equals(course.get().getTeacherId())) {
+            throw new PortalException(ExceptionType.ERROR, "公告修改者与课程老师不相同!");
+        }
+        Announcement announcement = announcementMapper.toAnnouncement(announcementVO);
+        Announcement result = announcementRepository.save(announcement);
+        return announcementMapper.toAnnouncementVO(result);
+    }
+
+    public AnnouncementVO getAnnouncementById(Long id) {
+        Optional<Announcement> announcement = announcementRepository.findById(id);
+        if (!announcement.isPresent()) {
+            throw new PortalException(ExceptionType.ERROR, "该公告不存在!");
+        }
+        return announcementMapper.toAnnouncementVO(announcement.get());
+    }
+}

+ 14 - 17
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -1,6 +1,6 @@
 package cn.seecoder.seecoderportalserver.service;
 
-import cn.seecoder.seecoderportalcommon.vo.CourseState;
+import cn.seecoder.seecoderportalcommon.vo.ObjectState;
 import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalcommon.vo.UserRole;
 import cn.seecoder.seecoderportalserver.domain.Course;
@@ -50,11 +50,7 @@ public class CourseService {
 
     public CourseVO getCourse(Long courseId) {
         Optional<Course> course = courseRepository.findById(courseId);
-        if (course.isPresent()) {
-            return courseMapper.courseToCourseVO(course.get());
-        } else {
-            return null;
-        }
+        return course.map(courseMapper::courseToCourseVO).orElse(null);
     }
 
     public CourseVO createCourse(CourseVO courseVO) {
@@ -65,7 +61,7 @@ public class CourseService {
         if (!teacher.isPresent()) {
             throw new PortalException(ExceptionType.ERROR, "该老师不存在");
         }
-        if(!teacher.get().getRole().equals(UserRole.TEACHER) && !teacher.get().getRole().equals(UserRole.ADMIN)){
+        if (!teacher.get().getRole().equals(UserRole.TEACHER) && !teacher.get().getRole().equals(UserRole.ADMIN)) {
             throw new PortalException(ExceptionType.ERROR, "该老师不存在");
         }
 
@@ -79,7 +75,7 @@ public class CourseService {
             throw new PortalException(ExceptionType.ERROR, "Coder: " + coderRes.get("msg"));
         }
         Course course = courseMapper.courseVOToCourse(courseVO);
-        course.setCourseState(CourseState.NORMAL);
+        course.setState(ObjectState.NORMAL);
         Course result = courseRepository.save(course);
         return courseMapper.courseToCourseVO(result);
     }
@@ -92,32 +88,33 @@ public class CourseService {
 
     // 伪删除
     public String deleteCourse(Long courseId) {
-        Course course = courseRepository.findById(courseId).get();
-        course.setCourseState(CourseState.DELETED);
+        Optional<Course> optionalCourse = courseRepository.findById(courseId);
+        if (!optionalCourse.isPresent()) {
+            throw new PortalException(ExceptionType.ERROR, "该课程不存在!");
+        }
+        Course course = optionalCourse.get();
+        course.setState(ObjectState.DELETED);
         courseRepository.save(course);
         return "课程删除成功";
     }
 
     public List<CourseVO> getAllCourses() {
         List<Course> courses = courseRepository.findAll();
-        List<CourseVO> courseVOs = courses.stream()
-                .filter(course -> course.getCourseState().equals(CourseState.NORMAL))
+        return courses.stream()
+                .filter(course -> course.getState().equals(ObjectState.NORMAL))
                 .map(courseMapper::courseToCourseVO)
                 .collect(Collectors.toList());
-        return courseVOs;
     }
 
     public List<CourseVO> getTeacherCourses(Long teacherId) {
         List<Course> courses = courseRepository.findCoursesByTeacherId(teacherId);
-        List<CourseVO> courseVOs = courses.stream().map(courseMapper::courseToCourseVO).collect(Collectors.toList());
-        return courseVOs;
+        return courses.stream().map(courseMapper::courseToCourseVO).collect(Collectors.toList());
     }
 
     public List<CourseVO> getStudentCourses(Long studentId) {
         List<CourseSelection> courseSelections = courseSelectionRepository.findCourseSelectionsByUserId(studentId);
-        List<CourseVO> courseVOs = courseSelections.stream()
+        return courseSelections.stream()
                 .map(courseSelection -> courseMapper.courseToCourseVO(courseRepository.findById(courseSelection.getCourseId()).get()))
                 .collect(Collectors.toList());
-        return courseVOs;
     }
 }

+ 34 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/AnnouncementController.java

@@ -0,0 +1,34 @@
+package cn.seecoder.seecoderportalserver.web.rest;
+
+import cn.seecoder.seecoderportalcommon.vo.AnnouncementVO;
+import cn.seecoder.seecoderportalserver.service.AnnouncementService;
+import cn.seecoder.seecoderportalserver.utility.OkResponse;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/announcement")
+public class AnnouncementController {
+    private final AnnouncementService announcementService;
+
+    public AnnouncementController(AnnouncementService announcementService) {this.announcementService = announcementService;}
+
+    @PostMapping
+    public OkResponse<AnnouncementVO> create(@RequestBody AnnouncementVO announcementVO) {
+        return OkResponse.of(announcementService.create(announcementVO));
+    }
+
+    @DeleteMapping
+    public OkResponse<String> delete(@RequestParam Long id, @RequestParam Long u) {
+        return OkResponse.of(announcementService.delete(id, u));
+    }
+
+    @PutMapping
+    public OkResponse<AnnouncementVO> update(@RequestBody AnnouncementVO announcementVO) {
+        return OkResponse.of(announcementService.update(announcementVO));
+    }
+
+    @GetMapping
+    public OkResponse<AnnouncementVO> getAnnouncementById(@RequestParam Long id) {
+        return OkResponse.of(announcementService.getAnnouncementById(id));
+    }
+}