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 implements TopicCommentUserAttitudeService { - @Autowired - private TopicCommentUserAttitudeRedis topicCommentUserAttitudeRedis; @Autowired private TopicCommentService topicCommentService; + @Autowired + private NewsTask newsTask; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -114,8 +119,14 @@ public class TopicCommentUserAttitudeServiceImpl extends BaseServiceImpl