elink-star
/
epmet-cloud-zhengwu-yantai
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

话题评论列表接口按组类型返人名

feature/evaluate
sunyuchao 5 years ago
parent
cb901a57b7
commit
8d037bd95b
1 changed files with 45 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

67
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
View File

@ -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<ResiTopicCommen
@Autowired
LoginUserUtil loginUserUtil;
@Autowired
ResiGroupDao resiGroupDao;
@Value("${openapi.scan.server.url}")
private String scanApiUrl;
@Value("${openapi.scan.method.textSyncScan}")
@ -270,7 +277,9 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
(content.substring(NumConstant.ZERO,NumConstant.TEN) + "…") :
content);
builder.append("\"");
}else builder.append("语音话题");
} else {
builder.append("语音话题");
}
pointEventMsg.setRemark(builder.toString());
pointEventMsgList.add(pointEventMsg);
@ -304,32 +313,46 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
//获取groupId
ResiTopicDTO topic =
resiTopicService.get(commentFormDTO.getTopicId());
/*List<String> userIdList = new ArrayList<>();
for (ResiCommentResultDTO comment : comments) {
userIdList.add(comment.getUserId());
}
UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO();
formDTO.setUserIdList(userIdList);
Result<List<UserResiInfoResultDTO>> 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<String> userIdList = new ArrayList<>();
for (ResiCommentResultDTO comment : comments) {
userIdList.add(comment.getUserId());
}
UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO();
formDTO.setUserIdList(userIdList);
Result<List<UserResiInfoResultDTO>> 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<String> userIds = comments.stream().map(m -> m.getUserId()).distinct().collect(Collectors.toList());
List<UserInfoResultDTO> 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<List<ResiCommentResultDTO>>().ok(comments);
}
return new Result<List<ResiCommentResultDTO>>().ok(comments);
}
/**

Write Preview
Loading…
Cancel
Save