发送两个事件的接口 修改入参

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.转话题为议题    组长
-
+                BasePointEventMsg pointEventMsg2 = new BasePointEventMsg();
-                pointEventMsg.setCustomerId(groupCache.getCustomerId());
+                pointEventMsg2.setCustomerId(groupCache.getCustomerId());
-                pointEventMsg.setUserId(topicTurnIssueFromDTO.getUserId());
+                pointEventMsg2.setUserId(topicTurnIssueFromDTO.getUserId());
-                pointEventMsg.setActionFlag(MqConstant.PLUS);
+                pointEventMsg2.setActionFlag(MqConstant.PLUS);
-                pointEventMsg.setIsCommon(false);
+                pointEventMsg2.setIsCommon(false);
-                pointEventMsg.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
+                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.转话题为议题    组长
-
+            BasePointEventMsg pointEventMsg2 = new BasePointEventMsg();
-            pointEventMsg.setCustomerId(groupCache.getCustomerId());
+            pointEventMsg2.setCustomerId(groupCache.getCustomerId());
-            pointEventMsg.setUserId(param.getUserId());
+            pointEventMsg2.setUserId(param.getUserId());
-            pointEventMsg.setActionFlag(MqConstant.PLUS);
+            pointEventMsg2.setActionFlag(MqConstant.PLUS);
-            pointEventMsg.setIsCommon(false);
+            pointEventMsg2.setIsCommon(false);
-            pointEventMsg.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
+            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()){

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));