From 6aabbfa6292d5ebe8fc7c262849e02d15271f0e2 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 28 Dec 2020 09:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E4=B8=A4=E4=B8=AA=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 34 +++++++++----------
 .../service/impl/TopicDraftServiceImpl.java   |  1 +
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index d17e85f490..c1c8324494 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1610,21 +1610,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 pointEventMsgList.add(pointEventMsg);
 
                 //2.转话题为议题    组长
-
-                pointEventMsg.setCustomerId(groupCache.getCustomerId());
-                pointEventMsg.setUserId(topicTurnIssueFromDTO.getUserId());
-                pointEventMsg.setActionFlag(MqConstant.PLUS);
-                pointEventMsg.setIsCommon(false);
-                pointEventMsg.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
+                BasePointEventMsg pointEventMsg2 = new BasePointEventMsg();
+                pointEventMsg2.setCustomerId(groupCache.getCustomerId());
+                pointEventMsg2.setUserId(topicTurnIssueFromDTO.getUserId());
+                pointEventMsg2.setActionFlag(MqConstant.PLUS);
+                pointEventMsg2.setIsCommon(false);
+                pointEventMsg2.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
 				//将话题“某某某…” （前十个字后面省略号） 转为议题
-				pointEventMsg.setRemark(new StringBuilder("将话题")
+				pointEventMsg2.setRemark(new StringBuilder("将话题")
 						.append(
 								"\"" +
 										topic.getTopicContent()
 												.substring(topic.getTopicContent().length() < NumConstant.TEN ? topic.getTopicContent().length() : NumConstant.TEN)
 										+ (NumConstant.TEN > topic.getTopicContent().length() ? "\"" : "…\"")
 						).append("转为议题").toString());
-                pointEventMsgList.add(pointEventMsg);
+                pointEventMsgList.add(pointEventMsg2);
 
                 mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));
                 if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){
@@ -1731,7 +1731,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             pointEventMsg.setUserId(group.getTopicAuthorId());
             pointEventMsg.setActionFlag(MqConstant.PLUS);
             pointEventMsg.setIsCommon(false);
-
+            pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_ISSUE.getEventTag());
             //某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为议题
 
             pointEventMsg.setRemark(new StringBuilder(groupCache.getGroupName()).append("小组中发布的")
@@ -1745,21 +1745,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             pointEventMsgList.add(pointEventMsg);
 
             //2.转话题为议题    组长
-
-            pointEventMsg.setCustomerId(groupCache.getCustomerId());
-            pointEventMsg.setUserId(param.getUserId());
-            pointEventMsg.setActionFlag(MqConstant.PLUS);
-            pointEventMsg.setIsCommon(false);
-            pointEventMsg.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
+            BasePointEventMsg pointEventMsg2 = new BasePointEventMsg();
+            pointEventMsg2.setCustomerId(groupCache.getCustomerId());
+            pointEventMsg2.setUserId(param.getUserId());
+            pointEventMsg2.setActionFlag(MqConstant.PLUS);
+            pointEventMsg2.setIsCommon(false);
+            pointEventMsg2.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
             //将话题“某某某…” （前十个字后面省略号） 转为议题
-            pointEventMsg.setRemark(new StringBuilder("将话题")
+            pointEventMsg2.setRemark(new StringBuilder("将话题")
                     .append(
                             "\"" +
                                     topic.getTopicContent()
                                             .substring(topic.getTopicContent().length() < NumConstant.TEN ? topic.getTopicContent().length() : NumConstant.TEN)
                                     + (NumConstant.TEN > topic.getTopicContent().length() ? "\"" : "…\"")
                     ).append("转为议题").toString());
-            pointEventMsgList.add(pointEventMsg);
+            pointEventMsgList.add(pointEventMsg2);
 
             mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));
             if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 753804175b..4e39fb27da 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -795,6 +795,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         actPointEventMsg.setIsCommon(false);
         actPointEventMsg.setRemark(new StringBuilder(groupName).append("小组中发布话题").append(topicBreviary).toString());
         actPointEventMsg.setTargetDate(targetDate);
+        actPointEventMsg.setEventTag(EventEnum.PUBLISH_ONE_TOPIC.getEventClass());
         actPointEventMsgList.add(actPointEventMsg);
 
         mqBaseMsgDTO.setMsg(JSON.toJSONString(actPointEventMsgList));