From ac688b17e0749e87d075c984b16d6d6261df321a Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Tue, 12 Nov 2019 09:08:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=9A=84=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E3=80=81=E8=AF=84=E8=AE=BA=E7=9A=84=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=8F=8D=E5=AF=B9=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/constant/TopicNoticeConstant.java     | 18 ++++----
 .../service/impl/TopicCommentServiceImpl.java | 11 +++--
 .../TopicCommentUserAttitudeServiceImpl.java  | 45 +++++++++++++------
 3 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/TopicNoticeConstant.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/TopicNoticeConstant.java
index 5a53e5d20..a86d6702a 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/TopicNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/TopicNoticeConstant.java
@@ -14,15 +14,6 @@ public interface TopicNoticeConstant {
      * 评论被回复
      */
     String NOTICE_TOPIC_COMMENT_REPLY = "你的评论【有新回复】";
-
-    /**
-     * 话题支持
-     */
-    String NOTICE_TOPIC_APPROVE = "你的话题【有新的支持】";
-    /**
-     * 话题反对
-     */
-    String NOTICE_TOPIC_OPPOSE = "你的话题【有新的反对】";
     /**
      * 评论支持
      */
@@ -49,6 +40,13 @@ public interface TopicNoticeConstant {
      */
     String NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_REPLY = "topicCommentReply";
 
+    /**
+     * 消息所属业务类型：话题评论支持
+     */
+    String NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_APPROVE = "topicCommentApprove";
 
-
+    /**
+     * 消息所属业务类型：话题评论反对
+     */
+    String NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_OPPOSE = "topicCommentOppose";
 }
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
index cf1ec5b9e..3eefc7772 100755
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
@@ -32,6 +32,7 @@ import com.elink.esua.epdc.dto.comment.TopicCommentsResultDTO;
 import com.elink.esua.epdc.dto.constant.TopicNoticeConstant;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.topic.TopicCommentsDTO;
+import com.elink.esua.epdc.dto.topic.TopicDTO;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.comment.dao.TopicCommentDao;
 import com.elink.esua.epdc.modules.comment.entity.TopicCommentEntity;
@@ -155,16 +156,19 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
         // 评论数加1
         topicService.updateCommentNum(commentEntity.getTopicId());
 
+        // 话题信息
+        TopicDTO topicDto = topicService.get(commentFormDTO.getTopicId());
+
         // 组装发送消息内容
         EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
         informationFormDTO.setType(TopicNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
+        informationFormDTO.setBusinessId(topicDto.getId());
         if (isComment) {
             // 评论
-            informationFormDTO.setUserId(commentEntity.getUserId());
-            informationFormDTO.setContent(commentEntity.getContent());
+            informationFormDTO.setUserId(topicDto.getUserId());
+            informationFormDTO.setContent(topicDto.getTopicContent());
             informationFormDTO.setTitle(TopicNoticeConstant.NOTICE_TOPIC_COMMENT);
             informationFormDTO.setBusinessType(TopicNoticeConstant.NOTICE_BUSINESS_TYPE_TOPIC_COMMENT);
-            informationFormDTO.setBusinessId(commentEntity.getId());
             informationFormDTO.setRelBusinessContent(commentFormDTO.getUserName()+"："+commentFormDTO.getContent());
         } else {
             // 回复
@@ -172,7 +176,6 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
             informationFormDTO.setContent(commentFormDTO.getUserName()+"："+commentFormDTO.getContent());
             informationFormDTO.setTitle(TopicNoticeConstant.NOTICE_TOPIC_COMMENT_REPLY);
             informationFormDTO.setBusinessType(TopicNoticeConstant.NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_REPLY);
-            informationFormDTO.setBusinessId(commentEntity.getId());
             informationFormDTO.setRelBusinessContent(parentComment.getContent());
         }
         // 发送消息
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java
index 3e9a50fad..8fd052268 100755
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java
@@ -20,14 +20,18 @@ package com.elink.esua.epdc.modules.comment.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dto.TopicCommentUserAttitudeDTO;
+import com.elink.esua.epdc.dto.comment.TopicCommentDTO;
 import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO;
+import com.elink.esua.epdc.dto.constant.TopicNoticeConstant;
+import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
+import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.comment.dao.TopicCommentUserAttitudeDao;
 import com.elink.esua.epdc.modules.comment.entity.TopicCommentUserAttitudeEntity;
-import com.elink.esua.epdc.modules.comment.redis.TopicCommentUserAttitudeRedis;
 import com.elink.esua.epdc.modules.comment.service.TopicCommentService;
 import com.elink.esua.epdc.modules.comment.service.TopicCommentUserAttitudeService;
 import org.apache.commons.lang3.StringUtils;
@@ -48,11 +52,12 @@ import java.util.Map;
 @Service
 public class TopicCommentUserAttitudeServiceImpl extends BaseServiceImpl<TopicCommentUserAttitudeDao, TopicCommentUserAttitudeEntity> implements TopicCommentUserAttitudeService {
 
-    @Autowired
-    private TopicCommentUserAttitudeRedis topicCommentUserAttitudeRedis;
     @Autowired
     private TopicCommentService topicCommentService;
 
+    @Autowired
+    private NewsTask newsTask;
+
     @Override
     public PageData<TopicCommentUserAttitudeDTO> page(Map<String, Object> params) {
         IPage<TopicCommentUserAttitudeEntity> page = baseDao.selectPage(
@@ -114,8 +119,14 @@ public class TopicCommentUserAttitudeServiceImpl extends BaseServiceImpl<TopicCo
         wrapper.eq(StringUtils.isNotBlank(formDto.getCommentId()), "COMMENT_ID", formDto.getCommentId());
         TopicCommentUserAttitudeEntity topicCommentUserAttitudeEntity =  baseDao.selectOne(wrapper);
 
+        // 组装发送消息内容
+        TopicCommentDTO commentDto = topicCommentService.get(formDto.getCommentId());
+        EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
+        informationFormDTO.setType(TopicNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
+        informationFormDTO.setUserId(commentDto.getUserId());
+        informationFormDTO.setContent(commentDto.getContent());
 
-        if ("0".equals(formDto.getAttitude()) || "1".equals(formDto.getAttitude())){
+        if (NumConstant.ZERO_STR.equals(formDto.getAttitude()) || NumConstant.ONE_STR.equals(formDto.getAttitude())){
             if (topicCommentUserAttitudeEntity == null){
                 //没有点赞或者点踩，直接插入数据
                 TopicCommentUserAttitudeDTO topicCommentUserAttitudeDTO = new TopicCommentUserAttitudeDTO();
@@ -124,11 +135,21 @@ public class TopicCommentUserAttitudeServiceImpl extends BaseServiceImpl<TopicCo
                 topicCommentUserAttitudeDTO.setAttitudeFlag(formDto.getAttitude());
                 this.save(topicCommentUserAttitudeDTO);
 
-                if ("0".equals(formDto.getAttitude())){
+                if (NumConstant.ZERO_STR.equals(formDto.getAttitude())){
                     topicCommentService.updateApproveNumAdd(formDto.getCommentId());
+
+                    // 支持
+                    informationFormDTO.setTitle(TopicNoticeConstant.NOTICE_COMMENT_APPROVE);
+                    informationFormDTO.setBusinessType(TopicNoticeConstant.NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_APPROVE);
+                    informationFormDTO.setRelBusinessContent(formDto.getUserName()+"支持了你的评论");
                 }
-                if ("1".equals(formDto.getAttitude())){
+                if (NumConstant.ONE_STR.equals(formDto.getAttitude())){
                     topicCommentService.updateOpposeNumAdd(formDto.getCommentId());
+
+                    // 反对
+                    informationFormDTO.setTitle(TopicNoticeConstant.NOTICE_COMMENT_OPPOSE);
+                    informationFormDTO.setBusinessType(TopicNoticeConstant.NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_OPPOSE);
+                    informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的评论");
                 }
 
             }else {
@@ -136,7 +157,7 @@ public class TopicCommentUserAttitudeServiceImpl extends BaseServiceImpl<TopicCo
                     topicCommentUserAttitudeEntity.setAttitudeFlag(formDto.getAttitude());
                     this.updateById(topicCommentUserAttitudeEntity);
 
-                    if ("0".equals(formDto.getAttitude())){
+                    if (NumConstant.ZERO_STR.equals(formDto.getAttitude())){
                         //赞数加1 踩数减一
                         topicCommentService.updateApproveNumAdd(formDto.getCommentId());
                         topicCommentService.updateOpposeNumSubtract(formDto.getCommentId());
@@ -150,18 +171,16 @@ public class TopicCommentUserAttitudeServiceImpl extends BaseServiceImpl<TopicCo
         }else {
             //删除点赞或踩的记录，如果重新点赞或踩则重新插入
             this.deleteById(topicCommentUserAttitudeEntity.getId());
-            if ("2".equals(formDto.getAttitude())){
+            if (NumConstant.TWO_STR.equals(formDto.getAttitude())){
                 //取消赞
                 topicCommentService.updateApproveNumSubtract(formDto.getCommentId());
             }
-            if ("3".equals(formDto.getAttitude())){
+            if (NumConstant.THREE_STR.equals(formDto.getAttitude())){
                 //取消踩
                 topicCommentService.updateOpposeNumSubtract(formDto.getCommentId());
             }
         }
-
-
-
-
+        // 发送消息
+        newsTask.insertUserInformation(informationFormDTO);
     }
 }