点赞取消提醒自己

28a81132 · 段启岩 · 087373a1 · 28a81132
Commit 28a81132 authored Feb 26, 2020 by 段启岩
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

src/main/java/cn/meteor/beyondclouds/modules/message/listener/MessageListener.java
+9 -0

No files found.
--- a/src/main/java/cn/meteor/beyondclouds/modules/message/listener/MessageListener.java
+++ b/src/main/java/cn/meteor/beyondclouds/modules/message/listener/MessageListener.java
@@ -12,6 +12,7 @@ import cn.meteor.beyondclouds.modules.blog.entity.BlogPraise;
 import cn.meteor.beyondclouds.modules.blog.service.IBlogCommentService;
 import cn.meteor.beyondclouds.modules.blog.service.IBlogPraiseService;
 import cn.meteor.beyondclouds.modules.blog.service.IBlogService;
+import cn.meteor.beyondclouds.modules.feedback.service.IFeedbackService;
 import cn.meteor.beyondclouds.modules.im.server.SocketIOService;
 import cn.meteor.beyondclouds.modules.message.dto.MessageDTO;
 import cn.meteor.beyondclouds.modules.message.entity.Message;
@@ -332,6 +333,7 @@ public class MessageListener implements DataItemChangeListener {
         */
        if (itemType.equals(DataItemType.BLOG_PRAISE)) {
            BlogPraise blogPraise = blogPraiseService.getById(itemId);
+            if (!blogPraise.getUserId().equals(operatorId)) {
                msgType = MessageType.BLOG_PRAISE.getType();
                Blog blog = blogService.getById(blogPraise.getTargetId());
                toUserId = blog.getUserId();
@@ -341,12 +343,14 @@ public class MessageListener implements DataItemChangeListener {
                        blog.getBlogId(),
                        blog.getBlogTitle());
            }
+        }
        /**
         * 项目点赞
         */
        if (itemType.equals(DataItemType.PROJECT_PRAISE)) {
            ProjectPraise projectPraise = projectPraiseService.getById(itemId);
+            if (!projectPraise.getUserId().equals(operatorId)) {
                msgType = MessageType.PROJECT_PRAISE.getType();
                Project project = projectService.getById(projectPraise.getTargetId());
                toUserId = project.getUserId();
@@ -356,12 +360,14 @@ public class MessageListener implements DataItemChangeListener {
                        project.getProjectId(),
                        project.getProjectName());
            }
+        }
        /**
         * 问题点赞
         */
        if (itemType.equals(DataItemType.QUESTION_PRAISE)) {
            QuestionPraise questionPraise = questionPraiseService.getById(itemId);
+            if (!questionPraise.getUserId().equals(operatorId)) {
                msgType = MessageType.QUESTION_PRAISE.getType();
                Question question = questionService.getById(questionPraise.getTargetId());
                toUserId = question.getUserId();
@@ -371,12 +377,14 @@ public class MessageListener implements DataItemChangeListener {
                        question.getQuestionId(),
                        question.getQuestionTitle());
            }
+        }
        /**
         * 动态点赞
         */
        if (itemType.equals(DataItemType.POST_PRAISE)) {
            PostPraise postPraise = postPraiseService.getById(itemId);
+            if (!postPraise.getUserId().equals(operatorId)) {
                msgType = MessageType.POST_PRAISE.getType();
                Post post = postService.getById(postPraise.getTargetId());
                toUserId = post.getUserId();
@@ -385,6 +393,7 @@ public class MessageListener implements DataItemChangeListener {
                        fromUser.getNickName(),
                        post.getContent());
            }
+        }
        if (null != toUserId) {
            saveAndSendMsg(fromUser, toUserId, msgType, msg);