Просмотр исходного кода

feat:
message基础增删改查

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

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

@@ -47,13 +47,13 @@ public class AnnouncementService {
         return announcementMapper.toAnnouncementVO(result);
         return announcementMapper.toAnnouncementVO(result);
     }
     }
 
 
-    public String delete(Long id, Long u) {
+    public String delete(Long id, Long userId) {
         Optional<Announcement> optionalAnnouncement = announcementRepository.findById(id);
         Optional<Announcement> optionalAnnouncement = announcementRepository.findById(id);
         if (!optionalAnnouncement.isPresent()) {
         if (!optionalAnnouncement.isPresent()) {
             throw new PortalException(ExceptionType.ERROR, "该公告不存在!");
             throw new PortalException(ExceptionType.ERROR, "该公告不存在!");
         }
         }
         Announcement announcement = optionalAnnouncement.get();
         Announcement announcement = optionalAnnouncement.get();
-        if (!announcement.getSenderId().equals(u)) {
+        if (!announcement.getSenderId().equals(userId)) {
             throw new PortalException(ExceptionType.ERROR, "当前角色无法删除该公告!");
             throw new PortalException(ExceptionType.ERROR, "当前角色无法删除该公告!");
         }
         }
         announcement.setState(ObjectState.DELETED);
         announcement.setState(ObjectState.DELETED);
@@ -66,16 +66,12 @@ public class AnnouncementService {
         if (!oldAnnouncement.isPresent()) {
         if (!oldAnnouncement.isPresent()) {
             throw new PortalException(ExceptionType.ERROR, "原公告不存在!");
             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());
         Optional<Course> course = courseRepository.findById(announcementVO.getCourse().getId());
         if (!course.isPresent()) {
         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, "公告修改者与课程老师不相同!");
+        if (!announcementVO.getSender().getId().equals(course.get().getTeacherId())) {
+            throw new PortalException(ExceptionType.ERROR, "用户无权修改公告!");
         }
         }
         Announcement announcement = announcementMapper.toAnnouncement(announcementVO);
         Announcement announcement = announcementMapper.toAnnouncement(announcementVO);
         Announcement result = announcementRepository.save(announcement);
         Announcement result = announcementRepository.save(announcement);

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

@@ -1,7 +1,102 @@
 package cn.seecoder.seecoderportalserver.service;
 package cn.seecoder.seecoderportalserver.service;
 
 
+import cn.seecoder.seecoderportalcommon.vo.MessageVO;
+import cn.seecoder.seecoderportalcommon.vo.ObjectState;
+import cn.seecoder.seecoderportalcommon.vo.ObjectType;
+import cn.seecoder.seecoderportalserver.domain.Announcement;
+import cn.seecoder.seecoderportalserver.domain.Course;
+import cn.seecoder.seecoderportalserver.domain.Message;
+import cn.seecoder.seecoderportalserver.domain.User;
+import cn.seecoder.seecoderportalserver.mapper.MessageMapper;
+import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
+import cn.seecoder.seecoderportalserver.repository.CourseRepository;
+import cn.seecoder.seecoderportalserver.repository.MessageRepository;
+import cn.seecoder.seecoderportalserver.repository.UserRepository;
+import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.Optional;
+
 @Service
 @Service
 public class MessageService {
 public class MessageService {
+    private final MessageRepository messageRepository;
+    private final MessageMapper messageMapper;
+    private final UserRepository userRepository;
+    private final AnnouncementRepository announcementRepository;
+    private final CourseRepository courseRepository;
+
+
+    public MessageService(MessageRepository messageRepository, MessageMapper messageMapper, UserRepository userRepository, AnnouncementRepository announcementRepository, CourseRepository courseRepository) {
+        this.messageRepository = messageRepository;
+        this.messageMapper = messageMapper;
+        this.userRepository = userRepository;
+        this.announcementRepository = announcementRepository;
+        this.courseRepository = courseRepository;
+    }
+
+    private Boolean verifyTarget(ObjectType type, Long id) {
+        switch (type) {
+            case ANNOUNCEMENT:
+                Optional<Announcement> optionalAnnouncement = announcementRepository.findById(id);
+                return optionalAnnouncement.isPresent();
+            case COURSE:
+                Optional<Course> optionalCourse = courseRepository.findById(id);
+                return optionalCourse.isPresent();
+            case COMMENT:
+                Optional<Message> comment = messageRepository.findById(id);
+                return comment.isPresent();
+            default:
+                return false;
+        }
+    }
+
+    public MessageVO create(MessageVO messageVO) {
+        Optional<User> sender = userRepository.findById(messageVO.getSender().getId());
+        if (!sender.isPresent()) {
+            throw new CustomErrorException("消息发送者不存在!");
+        }
+        if (!verifyTarget(messageVO.getTargetType(), messageVO.getTargetId())){
+            throw new CustomErrorException("消息目标不存在!");
+        }
+        Message message = messageMapper.toMessage(messageVO);
+        Message result = messageRepository.save(message);
+        return messageMapper.toMessageVO(result);
+    }
+
+    public String delete(Long id, Long userId) {
+        Optional<Message> optionalMessage = messageRepository.findById(id);
+        if (!optionalMessage.isPresent()) {
+            throw new CustomErrorException("该消息不存在!");
+        }
+        Message message = optionalMessage.get();
+        if (!message.getSenderId().equals(userId)) {
+            throw new CustomErrorException("用户无权删除消息!");
+        }
+        message.setState(ObjectState.DELETED);
+        messageRepository.save(message);
+        return "消息删除成功!";
+    }
+
+    public MessageVO update(MessageVO messageVO) {
+        Optional<Message> oldMessage = messageRepository.findById(messageVO.getId());
+        if(!oldMessage.isPresent()){
+            throw new CustomErrorException("原消息不存在!");
+        }
+        if (!verifyTarget(messageVO.getTargetType(), messageVO.getTargetId())){
+            throw new CustomErrorException("消息目标不存在!");
+        }
+        if(!oldMessage.get().getSenderId().equals(messageVO.getSender().getId())){
+            throw new CustomErrorException("用户无权修改消息");
+        }
+        Message result = messageRepository.save(messageMapper.toMessage(messageVO));
+        return messageMapper.toMessageVO(result);
+    }
+
+    public MessageVO getMessageById(Long id) {
+        Optional<Message> optionalMessage = messageRepository.findById(id);
+        if (!optionalMessage.isPresent()) {
+            throw new CustomErrorException("消息不存在!");
+        }
+        return messageMapper.toMessageVO(optionalMessage.get());
+    }
 }
 }

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

@@ -18,8 +18,8 @@ public class AnnouncementController {
     }
     }
 
 
     @DeleteMapping
     @DeleteMapping
-    public OkResponse<String> delete(@RequestParam Long id, @RequestParam Long u) {
-        return OkResponse.of(announcementService.delete(id, u));
+    public OkResponse<String> delete(@RequestParam Long id, @RequestParam Long userId) {
+        return OkResponse.of(announcementService.delete(id, userId));
     }
     }
 
 
     @PutMapping
     @PutMapping

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

@@ -1,9 +1,36 @@
 package cn.seecoder.seecoderportalserver.web.rest;
 package cn.seecoder.seecoderportalserver.web.rest;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import cn.seecoder.seecoderportalcommon.vo.MessageVO;
+import cn.seecoder.seecoderportalserver.service.MessageService;
+import cn.seecoder.seecoderportalserver.utility.OkResponse;
+import org.springframework.web.bind.annotation.*;
 
 
 @RestController
 @RestController
 @RequestMapping("/api/message")
 @RequestMapping("/api/message")
 public class MessageController {
 public class MessageController {
+    private final MessageService messageService;
+
+    public MessageController(MessageService messageService) {
+        this.messageService = messageService;
+    }
+
+    @PostMapping
+    public OkResponse<MessageVO> create(@RequestBody MessageVO messageVO) {
+        return OkResponse.of(messageService.create(messageVO));
+    }
+
+    @DeleteMapping
+    public OkResponse<String> delete(@RequestParam Long id, @RequestParam Long userId) {
+        return OkResponse.of(messageService.delete(id, userId));
+    }
+
+    @PutMapping
+    public OkResponse<MessageVO> update(@RequestBody MessageVO messageVO) {
+        return OkResponse.of(messageService.update(messageVO));
+    }
+
+    @GetMapping
+    public OkResponse<MessageVO> getMessageById(@RequestParam Long id) {
+        return OkResponse.of(messageService.getMessageById(id));
+    }
 }
 }