Merge branch 'dev_group_point' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1818,11 +1818,19 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                                         .replaceFirst("题议为转被","")).reverse()
                         ).append("转为议题").toString());
                 pointEventMsgList.add(pointEventMsg2);
-
-                mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));
-                if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){
-                    log.error("话题转议题事件发送失败，参数：{}",JSON.toJSONString(topicTurnIssueFromDTO));
-                }
+                pointEventMsgList.forEach(item -> {
+                    MqBaseMsgDTO msgDTO = new MqBaseMsgDTO();
+                    msgDTO.setEventClass("resi_group");
+                    //事件code  因为楼院小组的事件回调统一入口，外层的EventTag不能够判断具体的事件
+                    //因为可能会一次发送多个事件集合，需要对集合里的对象逐个判断
+                    msgDTO.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
+                    List<BasePointEventMsg> msgList = new ArrayList<>();
+                    msgList.add(item);
+                    msgDTO.setMsg(JSON.toJSONString(msgList));
+                    if(!SendMqMsgUtils.sendMsg(msgDTO).success()){
+                        log.error("话题转议题事件发送失败，参数：{}",JSON.toJSONString(topicTurnIssueFromDTO));
+                    }
+                });
                 //发送小组成就消息
                 TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
                     @Override
@@ -1939,11 +1947,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             //发送积分
 
             //mq的事件类型
-            MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO();
-            mqBaseMsgDTO.setEventClass("resi_group");
+//            MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO();
+//            mqBaseMsgDTO.setEventClass("resi_group");
             //事件code  因为楼院小组的事件回调统一入口，外层的EventTag不能够判断具体的事件
             //因为可能会一次发送多个事件集合，需要对集合里的对象逐个判断
-            mqBaseMsgDTO.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
+//            mqBaseMsgDTO.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
             List<BasePointEventMsg> pointEventMsgList = new ArrayList<>();
             //1.话题被转为议题  组内成员
 
@@ -1992,11 +2000,19 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                                  .toString().replaceFirst("题议为转被","")).reverse()
                     ).append("转为议题").toString());
             pointEventMsgList.add(pointEventMsg2);
-
-            mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));
-            if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){
-                log.error("话题转议题事件发送失败，参数：{}",JSON.toJSONString(param));
-            }
+            pointEventMsgList.forEach(item -> {
+                MqBaseMsgDTO msgDTO = new MqBaseMsgDTO();
+                msgDTO.setEventClass("resi_group");
+                //事件code  因为楼院小组的事件回调统一入口，外层的EventTag不能够判断具体的事件
+                //因为可能会一次发送多个事件集合，需要对集合里的对象逐个判断
+                msgDTO.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag());
+                List<BasePointEventMsg> msgList = new ArrayList<>();
+                msgList.add(item);
+                msgDTO.setMsg(JSON.toJSONString(msgList));
+                if(!SendMqMsgUtils.sendMsg(msgDTO).success()){
+                    log.error("话题转议题事件发送失败，参数：{}",JSON.toJSONString(param));
+                }
+            });
     }
         return issueInfo;
     }