点赞取消提醒自己

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,14 +333,16 @@ public class MessageListener implements DataItemChangeListener {
          */
         if (itemType.equals(DataItemType.BLOG_PRAISE)) {
             BlogPraise blogPraise = blogPraiseService.getById(itemId);
-            msgType = MessageType.BLOG_PRAISE.getType();
-            Blog blog = blogService.getById(blogPraise.getTargetId());
-            toUserId = blog.getUserId();
-            msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的博客<a target='_blank' href='/blog/detail/%s'>《%s》</a>！",
-                    fromUser.getUserId(),
-                    fromUser.getNickName(),
-                    blog.getBlogId(),
-                    blog.getBlogTitle());
+            if (!blogPraise.getUserId().equals(operatorId)) {
+                msgType = MessageType.BLOG_PRAISE.getType();
+                Blog blog = blogService.getById(blogPraise.getTargetId());
+                toUserId = blog.getUserId();
+                msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的博客<a target='_blank' href='/blog/detail/%s'>《%s》</a>！",
+                        fromUser.getUserId(),
+                        fromUser.getNickName(),
+                        blog.getBlogId(),
+                        blog.getBlogTitle());
+            }
         }
 
         /**
@@ -347,14 +350,16 @@ public class MessageListener implements DataItemChangeListener {
          */
         if (itemType.equals(DataItemType.PROJECT_PRAISE)) {
             ProjectPraise projectPraise = projectPraiseService.getById(itemId);
-            msgType = MessageType.PROJECT_PRAISE.getType();
-            Project project = projectService.getById(projectPraise.getTargetId());
-            toUserId = project.getUserId();
-            msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的项目<a target='_blank' href='/project/detail/%d'>《%s》</a>！",
-                    fromUser.getUserId(),
-                    fromUser.getNickName(),
-                    project.getProjectId(),
-                    project.getProjectName());
+            if (!projectPraise.getUserId().equals(operatorId)) {
+                msgType = MessageType.PROJECT_PRAISE.getType();
+                Project project = projectService.getById(projectPraise.getTargetId());
+                toUserId = project.getUserId();
+                msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的项目<a target='_blank' href='/project/detail/%d'>《%s》</a>！",
+                        fromUser.getUserId(),
+                        fromUser.getNickName(),
+                        project.getProjectId(),
+                        project.getProjectName());
+            }
         }
 
         /**
@@ -362,14 +367,16 @@ public class MessageListener implements DataItemChangeListener {
          */
         if (itemType.equals(DataItemType.QUESTION_PRAISE)) {
             QuestionPraise questionPraise = questionPraiseService.getById(itemId);
-            msgType = MessageType.QUESTION_PRAISE.getType();
-            Question question = questionService.getById(questionPraise.getTargetId());
-            toUserId = question.getUserId();
-            msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的问答<a target='_blank' href='/answer/detail/%s'>《%s》</a>！",
-                    fromUser.getUserId(),
-                    fromUser.getNickName(),
-                    question.getQuestionId(),
-                    question.getQuestionTitle());
+            if (!questionPraise.getUserId().equals(operatorId)) {
+                msgType = MessageType.QUESTION_PRAISE.getType();
+                Question question = questionService.getById(questionPraise.getTargetId());
+                toUserId = question.getUserId();
+                msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的问答<a target='_blank' href='/answer/detail/%s'>《%s》</a>！",
+                        fromUser.getUserId(),
+                        fromUser.getNickName(),
+                        question.getQuestionId(),
+                        question.getQuestionTitle());
+            }
         }
 
         /**
@@ -377,13 +384,15 @@ public class MessageListener implements DataItemChangeListener {
          */
         if (itemType.equals(DataItemType.POST_PRAISE)) {
             PostPraise postPraise = postPraiseService.getById(itemId);
-            msgType = MessageType.POST_PRAISE.getType();
-            Post post = postService.getById(postPraise.getTargetId());
-            toUserId = post.getUserId();
-            msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的动态《%s》！",
-                    fromUser.getUserId(),
-                    fromUser.getNickName(),
-                    post.getContent());
+            if (!postPraise.getUserId().equals(operatorId)) {
+                msgType = MessageType.POST_PRAISE.getType();
+                Post post = postService.getById(postPraise.getTargetId());
+                toUserId = post.getUserId();
+                msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的动态《%s》！",
+                        fromUser.getUserId(),
+                        fromUser.getNickName(),
+                        post.getContent());
+            }
         }
 
         if (null != toUserId) {