From bfc8646ba149529d411fdbc6e4be87468d48c5f9 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 25 Dec 2020 10:57:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=BD=AC=E7=A7=BB=E6=8F=90?= =?UTF-8?q?=20=E7=A7=AF=E5=88=86=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GroupMemeberOperationServiceImpl.java | 3 +- .../impl/ResiGroupMemberServiceImpl.java | 3 +- .../service/impl/ResiTopicServiceImpl.java | 35 +++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java index 8f4deee6c3..67a74321bf 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java @@ -333,10 +333,11 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl> userResponse = userClient.queryUserBaseInfo(userParam); if(userResponse.success() && !CollectionUtils.isEmpty(userResponse.getData())){ UserBaseInfoResultDTO user = userResponse.getData().get(NumConstant.ZERO); - pointEventMsg.setRemark( new StringBuilder("邀请").append("加入") + pointEventMsg.setRemark( new StringBuilder("邀请") .append(user.getStreet()).append("-").append(user.getSurname()) .append(StringUtils.equals(NumConstant.ONE_STR,user.getGender()) ? "先生" : StringUtils.equals(NumConstant.TWO_STR,user.getGender()) ? "女士" : "先生/女士") + .append("加入") .append(resiGroupDTO.getGroupName()).append("小组").toString()); } pointEventMsgList.add(pointEventMsg); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index ae48951046..9207200b6e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -545,10 +545,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl> userResponse = userOpenFeignClient.queryUserBaseInfo(userParam); if(userResponse.success() && !CollectionUtils.isEmpty(userResponse.getData())){ UserBaseInfoResultDTO user = userResponse.getData().get(NumConstant.ZERO); - pointEventMsg.setRemark( new StringBuilder("邀请").append("加入") + pointEventMsg.setRemark( new StringBuilder("邀请") .append(user.getStreet()).append("-").append(user.getSurname()) .append(StringUtils.equals(NumConstant.ONE_STR,user.getGender()) ? "先生" : StringUtils.equals(NumConstant.TWO_STR,user.getGender()) ? "女士" : "先生/女士") + .append("加入") .append(resiGroupDTO.getGroupName()).append("小组").toString()); } 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 03b37dc87d..c12a36fb6d 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 @@ -1580,8 +1580,43 @@ public class ResiTopicServiceImpl extends BaseServiceImpl pointEventMsgList = new ArrayList<>(); //1.话题被转为议题 组内成员 + group.getTopicAuthorId(); + BasePointEventMsg pointEventMsg = new BasePointEventMsg(); + pointEventMsg.setCustomerId(groupCache.getCustomerId()); + //pointEventMsg.setUserId(inviter); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + //pointEventMsg.setTargetDate(groupMemeberOperationDTO.getCreatedTime()); + pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_ISSUE.getEventTag()); + + pointEventMsgList.add(pointEventMsg); + //2.转话题为议题 组长 + topicTurnIssueFromDTO.getUserId(); + + + pointEventMsg.setCustomerId(groupCache.getCustomerId()); + //pointEventMsg.setUserId(inviter); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + //pointEventMsg.setTargetDate(groupMemeberOperationDTO.getCreatedTime()); + pointEventMsg.setEventTag(EventEnum.SHIFT_TOPIC_TO_ISSUE.getEventTag()); + + pointEventMsgList.add(pointEventMsg); + + mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList)); + if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){ + log.error("事件发送失败，参数：{}",JSON.toJSONString(topicTurnIssueFromDTO)); + } } else { ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.AllowAuditionGroup.class);