Browse Source

feat: 新建公告

mjh 4 years ago
parent
commit
4cf72cefef

+ 15 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/AnnouncementType.java

@@ -0,0 +1,15 @@
+package cn.seecoder.seecoderportalcommon.vo;
+
+public enum AnnouncementType {
+    ANNOUNCEMENT("ANNOUCEMENT"),
+    HOMEWORK("HOMEWORK"),
+    EXAM("EXAM");
+
+    private final String type;
+
+    AnnouncementType(String type) {this.type = type;}
+
+    public String getType() {
+        return type;
+    }
+}

+ 18 - 7
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/AnnouncementVO.java

@@ -7,7 +7,7 @@ public class AnnouncementVO {
 
 
     private UserVO sender;
     private UserVO sender;
 
 
-    private CourseVO course;
+    private Long courseId;
 
 
     private String title;
     private String title;
 
 
@@ -17,6 +17,8 @@ public class AnnouncementVO {
 
 
     private ObjectState state;
     private ObjectState state;
 
 
+    private AnnouncementType type;
+
     public Long getId() {
     public Long getId() {
         return id;
         return id;
     }
     }
@@ -33,12 +35,12 @@ public class AnnouncementVO {
         this.sender = sender;
         this.sender = sender;
     }
     }
 
 
-    public CourseVO getCourse() {
-        return course;
+    public Long getCourseId() {
+        return courseId;
     }
     }
 
 
-    public void setCourse(CourseVO course) {
-        this.course = course;
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
     }
     }
 
 
     public String getTitle() {
     public String getTitle() {
@@ -73,16 +75,25 @@ public class AnnouncementVO {
         this.state = state;
         this.state = state;
     }
     }
 
 
+    public AnnouncementType getType() {
+        return type;
+    }
+
+    public void setType(AnnouncementType type) {
+        this.type = type;
+    }
+
     @Override
     @Override
     public String toString() {
     public String toString() {
         return "AnnouncementVO{" +
         return "AnnouncementVO{" +
                 "id=" + id +
                 "id=" + id +
                 ", sender=" + sender +
                 ", sender=" + sender +
-                ", course=" + course +
+                ", courseId=" + courseId +
                 ", title='" + title + '\'' +
                 ", title='" + title + '\'' +
                 ", content='" + content + '\'' +
                 ", content='" + content + '\'' +
-                ", createAt=" + createdAt +
+                ", createdAt=" + createdAt +
                 ", state=" + state +
                 ", state=" + state +
+                ", type=" + type +
                 '}';
                 '}';
     }
     }
 }
 }

+ 3 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/config/SpringSecurityConfiguration.java

@@ -75,7 +75,9 @@ public class SpringSecurityConfiguration extends WebSecurityConfigurerAdapter {
                         "/api/course/checkName",
                         "/api/course/checkName",
                         "/api/eval/exams",
                         "/api/eval/exams",
                         "/api/eval/student/exams",
                         "/api/eval/student/exams",
-                        "/api/coder/exams")
+                        "/api/coder/exams",
+                        "/api/announcement",
+                        "/api/announcement/getAllByCourseId")
                 .permitAll() // authenticate
                 .permitAll() // authenticate
                 .and()
                 .and()
                 .authorizeRequests()
                 .authorizeRequests()

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

@@ -1,6 +1,8 @@
 package cn.seecoder.seecoderportalserver.domain;
 package cn.seecoder.seecoderportalserver.domain;
 
 
+import cn.seecoder.seecoderportalcommon.vo.AnnouncementType;
 import cn.seecoder.seecoderportalcommon.vo.ObjectState;
 import cn.seecoder.seecoderportalcommon.vo.ObjectState;
+import org.hibernate.annotations.CreationTimestamp;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
@@ -38,6 +40,18 @@ public class Announcement {
     @NotNull
     @NotNull
     private ObjectState state;
     private ObjectState state;
 
 
+    @Column
+    @NotNull
+    private AnnouncementType type;
+
+    public AnnouncementType getType() {
+        return type;
+    }
+
+    public void setType(AnnouncementType type) {
+        this.type = type;
+    }
+
     public Long getId() {
     public Long getId() {
         return id;
         return id;
     }
     }
@@ -104,6 +118,7 @@ public class Announcement {
                 ", content='" + content + '\'' +
                 ", content='" + content + '\'' +
                 ", createdAt=" + createdAt +
                 ", createdAt=" + createdAt +
                 ", state=" + state +
                 ", state=" + state +
+                ", type=" + type +
                 '}';
                 '}';
     }
     }
 }
 }

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

@@ -14,11 +14,9 @@ import java.util.Optional;
 @Component
 @Component
 public class AnnouncementMapperImpl implements AnnouncementMapper {
 public class AnnouncementMapperImpl implements AnnouncementMapper {
     private final UserService userService;
     private final UserService userService;
-    private final CourseService courseService;
 
 
     public AnnouncementMapperImpl(UserService userService, CourseService courseService) {
     public AnnouncementMapperImpl(UserService userService, CourseService courseService) {
         this.userService = userService;
         this.userService = userService;
-        this.courseService = courseService;
     }
     }
 
 
 
 
@@ -32,11 +30,12 @@ public class AnnouncementMapperImpl implements AnnouncementMapper {
 
 
         announcementVO.setId(announcement.getId());
         announcementVO.setId(announcement.getId());
         announcementVO.setSender(userService.findUserById(announcement.getSenderId()));
         announcementVO.setSender(userService.findUserById(announcement.getSenderId()));
-        announcementVO.setCourse(courseService.getCourseById(announcement.getCourseId()));
+        announcementVO.setCourseId(announcement.getCourseId());
         announcementVO.setTitle(announcement.getTitle());
         announcementVO.setTitle(announcement.getTitle());
         announcementVO.setContent(announcement.getContent());
         announcementVO.setContent(announcement.getContent());
         announcementVO.setCreatedAt(announcement.getCreatedAt());
         announcementVO.setCreatedAt(announcement.getCreatedAt());
         announcementVO.setState(announcement.getState());
         announcementVO.setState(announcement.getState());
+        announcementVO.setType(announcement.getType());
         return announcementVO;
         return announcementVO;
     }
     }
 
 
@@ -50,11 +49,12 @@ public class AnnouncementMapperImpl implements AnnouncementMapper {
 
 
         announcement.setId(announcementVO.getId());
         announcement.setId(announcementVO.getId());
         announcement.setSenderId(announcementVO.getSender().getId());
         announcement.setSenderId(announcementVO.getSender().getId());
-        announcement.setCourseId(announcementVO.getCourse().getId());
+        announcement.setCourseId(announcementVO.getId());
         announcement.setTitle(announcementVO.getTitle());
         announcement.setTitle(announcementVO.getTitle());
         announcement.setContent(announcementVO.getContent());
         announcement.setContent(announcementVO.getContent());
         announcement.setCreatedAt(announcementVO.getCreatedAt());
         announcement.setCreatedAt(announcementVO.getCreatedAt());
         announcement.setState(announcementVO.getState());
         announcement.setState(announcementVO.getState());
+        announcement.setType(announcementVO.getType());
         return announcement;
         return announcement;
     }
     }
 }
 }

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

@@ -3,5 +3,8 @@ package cn.seecoder.seecoderportalserver.repository;
 import cn.seecoder.seecoderportalserver.domain.Announcement;
 import cn.seecoder.seecoderportalserver.domain.Announcement;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 
+import java.util.List;
+
 public interface AnnouncementRepository extends JpaRepository<Announcement, Long> {
 public interface AnnouncementRepository extends JpaRepository<Announcement, Long> {
+    List<Announcement> findAnnouncementsByCourseId(Long courseId);
 }
 }

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

@@ -12,6 +12,9 @@ import cn.seecoder.seecoderportalserver.mapper.AnnouncementMapper;
 import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
 import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 @Service
 public class AnnouncementService {
 public class AnnouncementService {
     private final AnnouncementRepository announcementRepository;
     private final AnnouncementRepository announcementRepository;
@@ -28,7 +31,7 @@ public class AnnouncementService {
 
 
     public AnnouncementVO create(AnnouncementVO announcementVO) {
     public AnnouncementVO create(AnnouncementVO announcementVO) {
         UserVO sender = userService.findUserById(announcementVO.getSender().getId());
         UserVO sender = userService.findUserById(announcementVO.getSender().getId());
-        CourseVO course = courseService.getCourseById(announcementVO.getCourse().getId());
+        CourseVO course = courseService.getCourseById(announcementVO.getId());
         if (!sender.getId().equals(course.getTeacher().getId())) {
         if (!sender.getId().equals(course.getTeacher().getId())) {
             throw new CustomErrorException("当前用户无权发布公告");
             throw new CustomErrorException("当前用户无权发布公告");
         }
         }
@@ -50,7 +53,7 @@ public class AnnouncementService {
 
 
     public AnnouncementVO update(AnnouncementVO announcementVO) {
     public AnnouncementVO update(AnnouncementVO announcementVO) {
         this.getAnnouncementById(announcementVO.getId());
         this.getAnnouncementById(announcementVO.getId());
-        CourseVO course = courseService.getCourseById(announcementVO.getCourse().getId());
+        CourseVO course = courseService.getCourseById(announcementVO.getId());
         if (!announcementVO.getSender().getId().equals(course.getTeacher().getId())) {
         if (!announcementVO.getSender().getId().equals(course.getTeacher().getId())) {
             throw new PortalException(ExceptionType.ERROR, "当前用户无权修改公告");
             throw new PortalException(ExceptionType.ERROR, "当前用户无权修改公告");
         }
         }
@@ -63,4 +66,12 @@ public class AnnouncementService {
         Announcement announcement = announcementRepository.findById(id).orElseThrow(CustomErrorException::announcementNotFound);
         Announcement announcement = announcementRepository.findById(id).orElseThrow(CustomErrorException::announcementNotFound);
         return announcementMapper.toAnnouncementVO(announcement);
         return announcementMapper.toAnnouncementVO(announcement);
     }
     }
+
+    public List<AnnouncementVO> getAnnouncementsByCourseID(Long courseId){
+        courseService.getCourseById(courseId);
+        List<Announcement> announcementList = announcementRepository.findAnnouncementsByCourseId(courseId);
+        return announcementList.stream()
+                .map(announcementMapper::toAnnouncementVO)
+                .collect(Collectors.toList());
+    }
 }
 }

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

@@ -5,6 +5,8 @@ import cn.seecoder.seecoderportalserver.service.AnnouncementService;
 import cn.seecoder.seecoderportalserver.utility.OkResponse;
 import cn.seecoder.seecoderportalserver.utility.OkResponse;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import java.util.List;
+
 @RestController
 @RestController
 @RequestMapping("/api/announcement")
 @RequestMapping("/api/announcement")
 public class AnnouncementController {
 public class AnnouncementController {
@@ -31,4 +33,9 @@ public class AnnouncementController {
     public OkResponse<AnnouncementVO> getAnnouncementById(@RequestParam Long id) {
     public OkResponse<AnnouncementVO> getAnnouncementById(@RequestParam Long id) {
         return OkResponse.of(announcementService.getAnnouncementById(id));
         return OkResponse.of(announcementService.getAnnouncementById(id));
     }
     }
+
+    @GetMapping("/getAllByCourseId")
+    public OkResponse<List<AnnouncementVO>> getAnnouncementsByCourseId(@RequestParam Long courseId){
+        return OkResponse.of(announcementService.getAnnouncementsByCourseID(courseId));
+    }
 }
 }