Browse Source

feat:
调整了 ExceptionType PortalException
修改了原MessageVO为UserMessageVO
添加了Message相关功能文件

mjh 4 years ago
parent
commit
d9a4613366
17 changed files with 318 additions and 25 deletions
  1. 14 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/ActionType.java
  2. 6 6
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/AnnouncementVO.java
  3. 15 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/ObjectType.java
  4. 7 6
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Announcement.java
  5. 126 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Message.java
  6. 10 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/MessageMapper.java
  7. 2 2
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/AnnouncementMapperImpl.java
  8. 104 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/MessageMapperImpl.java
  9. 7 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/MessageRepository.java
  10. 2 2
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/AnnouncementService.java
  11. 2 2
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java
  12. 2 2
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/HttpService.java
  13. 7 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/MessageService.java
  14. 9 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/MessageController.java
  15. 3 3
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/UserController.java
  16. 1 1
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/ExceptionType.java
  17. 1 1
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/PortalException.java

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

@@ -0,0 +1,14 @@
+package cn.seecoder.seecoderportalcommon.vo;
+
+public enum ActionType {
+    COMMENT("COMMENT");
+
+    private final String type;
+
+    ActionType(String type) {this.type = type;}
+
+    public String getType() {
+        return type;
+    }
+}
+

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

@@ -13,7 +13,7 @@ public class AnnouncementVO {
 
 
     private String content;
     private String content;
 
 
-    private OffsetDateTime createAt;
+    private OffsetDateTime createdAt;
 
 
     private ObjectState state;
     private ObjectState state;
 
 
@@ -57,12 +57,12 @@ public class AnnouncementVO {
         this.content = content;
         this.content = content;
     }
     }
 
 
-    public OffsetDateTime getCreateAt() {
-        return createAt;
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
     }
     }
 
 
-    public void setCreateAt(OffsetDateTime createAt) {
-        this.createAt = createAt;
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
     }
     }
 
 
     public ObjectState getState() {
     public ObjectState getState() {
@@ -81,7 +81,7 @@ public class AnnouncementVO {
                 ", course=" + course +
                 ", course=" + course +
                 ", title='" + title + '\'' +
                 ", title='" + title + '\'' +
                 ", content='" + content + '\'' +
                 ", content='" + content + '\'' +
-                ", createAt=" + createAt +
+                ", createAt=" + createdAt +
                 ", state=" + state +
                 ", state=" + state +
                 '}';
                 '}';
     }
     }

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

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

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

@@ -31,9 +31,10 @@ public class Announcement {
 
 
     @Column
     @Column
     @NotNull
     @NotNull
-    private OffsetDateTime createAt;
+    private OffsetDateTime createdAt;
 
 
     @Column
     @Column
+    @Enumerated(EnumType.STRING)
     @NotNull
     @NotNull
     private ObjectState state;
     private ObjectState state;
 
 
@@ -77,12 +78,12 @@ public class Announcement {
         this.content = content;
         this.content = content;
     }
     }
 
 
-    public OffsetDateTime getCreateAt() {
-        return createAt;
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
     }
     }
 
 
-    public void setCreateAt(OffsetDateTime createdAt) {
-        this.createAt = createdAt;
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
     }
     }
 
 
     public ObjectState getState() {
     public ObjectState getState() {
@@ -101,7 +102,7 @@ public class Announcement {
                 ", courseId=" + courseId +
                 ", courseId=" + courseId +
                 ", title='" + title + '\'' +
                 ", title='" + title + '\'' +
                 ", content='" + content + '\'' +
                 ", content='" + content + '\'' +
-                ", createdAt=" + createAt +
+                ", createdAt=" + createdAt +
                 ", state=" + state +
                 ", state=" + state +
                 '}';
                 '}';
     }
     }

+ 126 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Message.java

@@ -0,0 +1,126 @@
+package cn.seecoder.seecoderportalserver.domain;
+
+import cn.seecoder.seecoderportalcommon.vo.ActionType;
+import cn.seecoder.seecoderportalcommon.vo.ObjectState;
+import cn.seecoder.seecoderportalcommon.vo.ObjectType;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.time.OffsetDateTime;
+
+@Entity
+@Table(name = "message")
+public class Message {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @Column
+    @NotNull
+    private Long senderId;
+
+    @Column
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    private ActionType actionType;
+
+    @Column
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    private ObjectType targetType;
+
+    @Column
+    @NotNull
+    private Long targetId;
+
+    @Column
+    @NotNull
+    private String content;
+
+    @Column
+    @NotNull
+    private OffsetDateTime createdAt;
+
+    @Column
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    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 ActionType getActionType() {
+        return actionType;
+    }
+
+    public void setActionType(ActionType actionType) {
+        this.actionType = actionType;
+    }
+
+    public ObjectType getTargetType() {
+        return targetType;
+    }
+
+    public void setTargetType(ObjectType targetType) {
+        this.targetType = targetType;
+    }
+
+    public Long getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(Long targetId) {
+        this.targetId = targetId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public ObjectState getState() {
+        return state;
+    }
+
+    public void setState(ObjectState state) {
+        this.state = state;
+    }
+
+    @Override
+    public String toString() {
+        return "Comment{" +
+                "id=" + id +
+                ", senderId=" + senderId +
+                ", actionType=" + actionType +
+                ", targetType=" + targetType +
+                ", targetId=" + targetId +
+                ", content=" + content +
+                ", createdAt=" + createdAt +
+                ", state=" + state +
+                '}';
+    }
+}

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

@@ -0,0 +1,10 @@
+package cn.seecoder.seecoderportalserver.mapper;
+
+import cn.seecoder.seecoderportalcommon.vo.MessageVO;
+import cn.seecoder.seecoderportalserver.domain.Message;
+
+public interface MessageMapper {
+    Message toMessage(MessageVO messageVO);
+
+    MessageVO toMessageVO(Message message);
+}

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

@@ -42,7 +42,7 @@ public class AnnouncementMapperImpl implements AnnouncementMapper {
         course.ifPresent(course1 -> announcementVO.setCourse(courseMapper.courseToCourseVO(course1)));
         course.ifPresent(course1 -> announcementVO.setCourse(courseMapper.courseToCourseVO(course1)));
         announcementVO.setTitle(announcement.getTitle());
         announcementVO.setTitle(announcement.getTitle());
         announcementVO.setContent(announcement.getContent());
         announcementVO.setContent(announcement.getContent());
-        announcementVO.setCreateAt(announcement.getCreateAt());
+        announcementVO.setCreatedAt(announcement.getCreatedAt());
         announcementVO.setState(announcement.getState());
         announcementVO.setState(announcement.getState());
         return announcementVO;
         return announcementVO;
     }
     }
@@ -60,7 +60,7 @@ public class AnnouncementMapperImpl implements AnnouncementMapper {
         announcement.setCourseId(announcementVO.getCourse().getId());
         announcement.setCourseId(announcementVO.getCourse().getId());
         announcement.setTitle(announcementVO.getTitle());
         announcement.setTitle(announcementVO.getTitle());
         announcement.setContent(announcementVO.getContent());
         announcement.setContent(announcementVO.getContent());
-        announcement.setCreateAt(announcementVO.getCreateAt());
+        announcement.setCreatedAt(announcementVO.getCreatedAt());
         announcement.setState(announcementVO.getState());
         announcement.setState(announcementVO.getState());
         return announcement;
         return announcement;
     }
     }

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

@@ -0,0 +1,104 @@
+package cn.seecoder.seecoderportalserver.mapper.impl;
+
+import cn.seecoder.seecoderportalcommon.vo.MessageVO;
+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.AnnouncementMapper;
+import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
+import cn.seecoder.seecoderportalserver.mapper.MessageMapper;
+import cn.seecoder.seecoderportalserver.mapper.UserMapper;
+import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
+import cn.seecoder.seecoderportalserver.repository.CourseRepository;
+import cn.seecoder.seecoderportalserver.repository.UserRepository;
+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 org.springframework.stereotype.Component;
+
+import java.util.Optional;
+
+@Component
+public class MessageMapperImpl implements MessageMapper {
+    private final UserRepository userRepository;
+    private final UserMapper userMapper;
+    private final CourseRepository courseRepository;
+    private final CourseMapper courseMapper;
+    private final AnnouncementRepository announcementRepository;
+    private final AnnouncementMapper announcementMapper;
+
+    public MessageMapperImpl(UserRepository userRepository, UserMapper userMapper, CourseRepository courseRepository, CourseMapper courseMapper, AnnouncementRepository announcementRepository, AnnouncementMapper announcementMapper) {
+        this.userRepository = userRepository;
+        this.userMapper = userMapper;
+        this.courseRepository = courseRepository;
+        this.courseMapper = courseMapper;
+        this.announcementRepository = announcementRepository;
+        this.announcementMapper = announcementMapper;
+    }
+
+    @Override
+    public Message toMessage(MessageVO messageVO) {
+        if (messageVO == null) {
+            return null;
+        }
+
+        Message message = new Message();
+
+        message.setId(messageVO.getId());
+        message.setId(messageVO.getSender().getId());
+        message.setActionType(messageVO.getActionType());
+        message.setTargetType(messageVO.getTargetType());
+        message.setTargetId(messageVO.getTargetId());
+        message.setContent(messageVO.getContent());
+        message.setCreatedAt(messageVO.getCreatedAt());
+        message.setState(messageVO.getState());
+        return message;
+    }
+
+    @Override
+    public MessageVO toMessageVO(Message message) {
+        if (message == null) {
+            return null;
+        }
+
+        MessageVO messageVO = new MessageVO();
+
+        messageVO.setId(message.getId());
+        Optional<User> optionalUser = userRepository.findById(message.getSenderId());
+        if (optionalUser.isPresent()) {
+            messageVO.setSender(userMapper.userToUserVO(optionalUser.get()));
+        } else {
+            throw new PortalException(ExceptionType.ERROR, "消息发送者不存在!");
+        }
+        messageVO.setActionType(message.getActionType());
+        messageVO.setTargetType(message.getTargetType());
+        messageVO.setTargetId(message.getTargetId());
+        switch (message.getTargetType()) {
+            case COURSE:
+                Optional<Course> optionalCourse = courseRepository.findById(message.getTargetId());
+                if (optionalCourse.isPresent()) {
+                    messageVO.setTarget(courseMapper.courseToCourseVO(optionalCourse.get()));
+                } else {
+                    throw new PortalException(ExceptionType.ERROR, "消息有关课程不存在!");
+                }
+                break;
+            case COMMENT:
+                break;
+            case ANNOUNCEMENT:
+                Optional<Announcement> optionalAnnouncement = announcementRepository.findById(message.getId());
+                if(optionalAnnouncement.isPresent()){
+                    messageVO.setTarget(announcementMapper.toAnnouncementVO(optionalAnnouncement.get()));
+                }else{
+                    throw new PortalException(ExceptionType.ERROR, "消息有关公告不存在!");
+                }
+                break;
+            default:
+                break;
+        }
+        messageVO.setContent(message.getContent());
+        messageVO.setCreatedAt(message.getCreatedAt());
+        messageVO.setState(message.getState());
+        return messageVO;
+    }
+}

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

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

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

@@ -5,8 +5,8 @@ import cn.seecoder.seecoderportalcommon.vo.ObjectState;
 import cn.seecoder.seecoderportalserver.domain.Announcement;
 import cn.seecoder.seecoderportalserver.domain.Announcement;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.domain.User;
-import cn.seecoder.seecoderportalserver.exception.ExceptionType;
-import cn.seecoder.seecoderportalserver.exception.PortalException;
+import cn.seecoder.seecoderportalserver.web.rest.errors.ExceptionType;
+import cn.seecoder.seecoderportalserver.web.rest.errors.PortalException;
 import cn.seecoder.seecoderportalserver.mapper.AnnouncementMapper;
 import cn.seecoder.seecoderportalserver.mapper.AnnouncementMapper;
 import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
 import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
 import cn.seecoder.seecoderportalserver.repository.CourseRepository;
 import cn.seecoder.seecoderportalserver.repository.CourseRepository;

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

@@ -6,8 +6,8 @@ import cn.seecoder.seecoderportalcommon.vo.UserRole;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.CourseSelection;
 import cn.seecoder.seecoderportalserver.domain.CourseSelection;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.domain.User;
-import cn.seecoder.seecoderportalserver.exception.ExceptionType;
-import cn.seecoder.seecoderportalserver.exception.PortalException;
+import cn.seecoder.seecoderportalserver.web.rest.errors.ExceptionType;
+import cn.seecoder.seecoderportalserver.web.rest.errors.PortalException;
 import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
 import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
 import cn.seecoder.seecoderportalserver.repository.CourseRepository;
 import cn.seecoder.seecoderportalserver.repository.CourseRepository;
 import cn.seecoder.seecoderportalserver.repository.CourseSelectionRepository;
 import cn.seecoder.seecoderportalserver.repository.CourseSelectionRepository;

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

@@ -1,7 +1,7 @@
 package cn.seecoder.seecoderportalserver.service;
 package cn.seecoder.seecoderportalserver.service;
 
 
-import cn.seecoder.seecoderportalserver.exception.ExceptionType;
-import cn.seecoder.seecoderportalserver.exception.PortalException;
+import cn.seecoder.seecoderportalserver.web.rest.errors.ExceptionType;
+import cn.seecoder.seecoderportalserver.web.rest.errors.PortalException;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.Consts;
 import org.apache.http.Consts;

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

@@ -0,0 +1,7 @@
+package cn.seecoder.seecoderportalserver.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class MessageService {
+}

+ 9 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/MessageController.java

@@ -0,0 +1,9 @@
+package cn.seecoder.seecoderportalserver.web.rest;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/message")
+public class MessageController {
+}

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

@@ -1,6 +1,6 @@
 package cn.seecoder.seecoderportalserver.web.rest;
 package cn.seecoder.seecoderportalserver.web.rest;
 
 
-import cn.seecoder.seecoderportalcommon.vo.MessageVO;
+import cn.seecoder.seecoderportalcommon.vo.UserMessageVO;
 import cn.seecoder.seecoderportalcommon.vo.dto.*;
 import cn.seecoder.seecoderportalcommon.vo.dto.*;
 import cn.seecoder.seecoderportalcommon.vo.UserVO;
 import cn.seecoder.seecoderportalcommon.vo.UserVO;
 import cn.seecoder.seecoderportalserver.mapper.UserMapper;
 import cn.seecoder.seecoderportalserver.mapper.UserMapper;
@@ -41,9 +41,9 @@ public class UserController {
     }
     }
 
 
     @PostMapping("/sendMessage")
     @PostMapping("/sendMessage")
-    public OkResponse<MessageVO> sendMessage(@RequestBody PhoneDTO phoneDTO) {
+    public OkResponse<UserMessageVO> sendMessage(@RequestBody PhoneDTO phoneDTO) {
         aliService.sendMessage(phoneDTO.getPhone());
         aliService.sendMessage(phoneDTO.getPhone());
-        return OkResponse.of(new MessageVO("短信发送成功"));
+        return OkResponse.of(new UserMessageVO("短信发送成功"));
     }
     }
 
 
     @GetMapping("/getInfo")
     @GetMapping("/getInfo")

+ 1 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/exception/ExceptionType.java → seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/ExceptionType.java

@@ -1,4 +1,4 @@
-package cn.seecoder.seecoderportalserver.exception;
+package cn.seecoder.seecoderportalserver.web.rest.errors;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;

+ 1 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/exception/PortalException.java → seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/PortalException.java

@@ -1,4 +1,4 @@
-package cn.seecoder.seecoderportalserver.exception;
+package cn.seecoder.seecoderportalserver.web.rest.errors;
 
 
 import lombok.Getter;
 import lombok.Getter;