From 83d6d42bf2ad1b2902066a5c93a368508a533d22 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 26 Apr 2021 09:56:00 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=8E=BB=E6=8E=89=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aeb994df
---
 .../modules/topic/service/impl/ResiTopicServiceImpl.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 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 1d0e8af89b..87c8afe53c 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
@@ -118,6 +118,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.validation.constraints.NotBlank;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -1952,7 +1953,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             pointEventMsgList.add(pointEventMsg);
 
             //2.转话题为议题    组长
-           /* BasePointEventMsg pointEventMsg2 = new BasePointEventMsg();
+            BasePointEventMsg pointEventMsg2 = new BasePointEventMsg();
             pointEventMsg2.setCustomerId(groupCache.getCustomerId());
             pointEventMsg2.setAgencyId(dataFilterResult.getData().getAgencyId());
             pointEventMsg2.setGridId(group.getGridId());
@@ -1969,7 +1970,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                          new StringBuilder(new StringBuilder(pointEventMsg.getRemark().replaceFirst(new StringBuilder(groupCache.getGroupName()).append("小组中发布的").toString(),"")).reverse()
                                  .toString().replaceFirst("题议为转被","")).reverse()
                     ).append("转为议题").toString());
-            pointEventMsgList.add(pointEventMsg2);*/
+            pointEventMsgList.add(pointEventMsg2);
 
             mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));
             if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){