From 8d037bd95ba1915c26f0a2ae8e640fc0ab7c9262 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 27 Apr 2021 16:53:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=8C=89=E7=BB=84=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=BF=94=E4=BA=BA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ResiTopicCommentServiceImpl.java | 67 +++++++++++++------ 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java index c930e96965..5dd5a57b80 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java @@ -40,11 +40,14 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.commons.tools.utils.SendMqMsgUtils; import com.epmet.dto.form.UserResiInfoListFormDTO; +import com.epmet.dto.result.UserInfoResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.comment.entity.ResiTopicCommentEntity; import com.epmet.modules.constant.ResiGroupRedisKeys; import com.epmet.modules.constant.WxmpSubscribeConstant; import com.epmet.modules.feign.EpmetUserFeignClient; +import com.epmet.modules.group.dao.ResiGroupDao; +import com.epmet.modules.group.entity.ResiGroupEntity; import com.epmet.modules.group.redis.ResiGroupRedis; import com.epmet.modules.member.dao.ResiGroupMemberDao; import com.epmet.modules.member.redis.ResiGroupMemberRedis; @@ -58,6 +61,7 @@ import com.epmet.resi.group.constant.MemberStateConstant; import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; +import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO; import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO; @@ -113,6 +117,9 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl userIdList = new ArrayList<>(); - for (ResiCommentResultDTO comment : comments) { - userIdList.add(comment.getUserId()); - } - UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO(); - formDTO.setUserIdList(userIdList); - Result> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO); - if (userResiInfoDTOListResult.success() && null != userResiInfoDTOListResult.getData()) { - if (userResiInfoDTOListResult.getData().size() > 0) { - for (UserResiInfoResultDTO resiUser : userResiInfoDTOListResult.getData()) { - for (ResiCommentResultDTO comment : comments) { - if (StringUtils.equals(comment.getUserId(), resiUser.getUserId())) { - comment.setCommentUserHeadPhoto(resiUser.getHeadPhoto()); - comment.setCommentUserName(resiUser.getShowName()); - continue; + /*List userIdList = new ArrayList<>(); + for (ResiCommentResultDTO comment : comments) { + userIdList.add(comment.getUserId()); + } + UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO(); + formDTO.setUserIdList(userIdList); + Result> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO); + if (userResiInfoDTOListResult.success() && null != userResiInfoDTOListResult.getData()) { + if (userResiInfoDTOListResult.getData().size() > 0) { + for (UserResiInfoResultDTO resiUser : userResiInfoDTOListResult.getData()) { + for (ResiCommentResultDTO comment : comments) { + if (StringUtils.equals(comment.getUserId(), resiUser.getUserId())) { + comment.setCommentUserHeadPhoto(resiUser.getHeadPhoto()); + comment.setCommentUserName(resiUser.getShowName()); + continue; + } } } + } + }else{ + logger.warn(ModuleConstant.USER_INFO_LIST_NOT_FOUND); + }*/ + setCacheUserInfo(topic.getGroupId(),comments); + //支部小组人员返真实姓名 + ResiGroupEntity entity = resiGroupDao.selectById(topic.getGroupId()); + if("".equals(entity.getGroupType())){ + List userIds = comments.stream().map(m -> m.getUserId()).distinct().collect(Collectors.toList()); + List userInfos = resiTopicService.disPoseUserInfo(entity.getGroupType(), userIds); + comments.forEach(item -> { + userInfos.forEach(u->{ + if(item.getUserId().equals(u.getUserId())){ + item.setCommentUserName(u.getReleaseUserName()); } + }); + }); } - }else{ - logger.warn(ModuleConstant.USER_INFO_LIST_NOT_FOUND); - }*/ - setCacheUserInfo(topic.getGroupId(),comments); - } - return new Result>().ok(comments); + } + + return new Result>().ok(comments); } /** From 37d7a64826328ae7fcbd747b1ca219bc6fff6abf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 27 Apr 2021 17:03:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=EF=BC=8C?= =?UTF-8?q?=E5=B7=B2=E9=A9=B3=E5=9B=9E=20=E8=AE=AE=E9=A2=98=20=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/ResiGroupDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 0f170f1a80..0abccca57f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -468,7 +468,7 @@ UNIX_TIMESTAMP(rt.CREATED_TIME) AS publishedTime, rt.TOPIC_CONTENT as topicContent, ta.ATTACHMENT_URL AS imgUrl, - rt.GROUP_ID + rt.GROUP_ID AS groupId FROM resi_topic rt LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = rt.ID WHERE rt.DEL_FLAG = '0'