diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java index 19bfd88186..f4cfd43b40 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java @@ -17,5 +17,6 @@ public class UserInfosResultDTO implements Serializable { private String userId; private String userShowName; private String headPhoto; + private String realName; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java index 7fc47655e4..33b4b9243e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java @@ -83,4 +83,9 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审 * VISIT_SWITCH 小组是否允许参观:允许：open;不允许：closed */ private String visitSwitch; + + /** + * 小组类型(ordinary:楼院小组 branch:支部小组) + */ + private String groupType; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java index 5e5c727555..253d42f78b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java @@ -5,9 +5,11 @@ import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.resigroup.ResiGroupDao; import com.epmet.dataaggre.dao.resigroup.ResiTopicDao; import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO; +import com.epmet.dataaggre.dto.resigroup.ResiGroupDTO; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO; import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO; +import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity; import com.epmet.dataaggre.redis.ResiGroupRedis; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.resigroup.ResiGroupService; @@ -63,12 +65,18 @@ public class ResiGroupServiceImpl implements ResiGroupService { List userIds = result.stream().map(m -> m.getUserId()).collect(Collectors.toList()); // 查询用户信息【名字 头像】 List userInfos = epmetUserService.selectUserInfosByUserIds(userIds); + //查询小组信息 + ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId()); result.forEach(r -> { if (!CollectionUtils.isEmpty(userInfos)){ userInfos.forEach(u -> { if (r.getUserId().equals(u.getUserId())){ r.setHeadPhoto(u.getHeadPhoto()); - r.setUserShowName(u.getUserShowName()); + if("branch".equals(group.getGroupType())){ + r.setUserShowName(u.getRealName()); + }else { + r.setUserShowName(u.getUserShowName()); + } } }); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 489908227d..7e72f2a85e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml @@ -12,7 +12,8 @@ WHEN GENDER = '2' THEN '女士' ELSE '先生/女士' END ) AS userShowName, - HEAD_IMG_URL AS headPhoto + HEAD_IMG_URL AS headPhoto, + REAL_NAME AS realName FROM user_base_info WHERE DEL_FLAG = 0 AND diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java index ed715cb344..95f8b34591 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java @@ -51,8 +51,10 @@ public class WxLoginServiceImpl implements WxLoginService { String resultStr = HttpClientManager.getInstance().sendGet(WxLoginConstant.WXCODE_BY_OPENID, map).getData(); HashMap hashMap = JSON.parseObject(resultStr, HashMap.class); if (null != hashMap.get("errcode")) { - logger.error("wxcode换取openid接口调用失败"); - throw new RenException(hashMap.get("errmsg")); + //45011:API 调用太频繁，请稍候再试;40029: code 无效 【错误码：https://developers.weixin.qq.com/doc/oplatform/Return_codes/Return_code_descriptions_new.html】 + throw new RenException(String.format("wxcode换取用户基本信息失败，wxcode->%s,错误码->%s,错误信息->%s", wxCode, hashMap.get("errcode"), hashMap.get("errmsg"))); + /*logger.error("wxcode换取openid接口调用失败"); + throw new RenException(hashMap.get("errmsg"));*/ } String openid = hashMap.get("openid"); String sessionKey = hashMap.get("session_key"); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index be7a1399dd..2bf04ad54d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -363,10 +363,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl(); } + // 查询小组信息，为了拿小组的类型，是支部还是楼院 + ResiGroupEntity resiGroup = resiGroupDao.selectById(groupId); UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO(); resiUserInfoFormDTO.setCustomerId(customerId); resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId()); - return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + Result userResiInfo = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + if (!userResiInfo.success()){ + throw new RenException("根据组id查询组长信息失败了"); + } + if (null != resiGroup && ModuleConstant.GROUP_TYPE_BRANCH.equals(resiGroup.getGroupType())){ + UserResiInfoResultDTO data = userResiInfo.getData(); + userResiInfo.getData().setShowName(data.getStreet()+"-"+data.getSurname()+data.getName()); + } + return userResiInfo; } /** 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 44d4ffe38a..1f78f59882 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 @@ -38,6 +38,7 @@ import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.CommonDataFilterResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; +import com.epmet.dto.result.UserInfoResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -60,6 +61,7 @@ import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.modules.topic.entity.TopicShareLinkVisitRecordEntity; import com.epmet.modules.topic.service.ResiTopicService; import com.epmet.modules.topic.service.TopicShareLinkVisitRecordService; +import com.epmet.modules.topic.service.impl.ResiTopicServiceImpl; import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.constant.EnterGroupTypeConstant; import com.epmet.resi.group.constant.LeaderFlagConstant; @@ -401,9 +403,25 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); + List userInfos = resiTopicService.disPoseUserInfo(resiGroup.getGroupType(), userIdList); + if (CollectionUtils.isEmpty(userInfos)){ + throw new RenException("查询用户信息失败了"); + } + list.forEach(l -> { + userInfos.forEach(u -> { + if (l.getUserId().equals(u.getUserId())){ + l.setUserShowName(u.getReleaseUserName()); + l.setHeadPhoto(u.getReleaseUserHeadPhoto()); + } + }); + }); + /*Result> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); if(userResiInfoDTOListResult.success()){ for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ for (GroupMemberListResultDTO groupMember : list) { @@ -420,7 +438,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl { * @date 2021/4/21 下午4:08 */ List getPastTopicListV2(GetPastTopicListV2FormDTO formDTO); + + /** + * @Description 查询用户信息【头像，名字】 + * @Param groupType + * @Param userIds + * @author zxc + * @date 2021/4/27 下午1:50 + */ + List disPoseUserInfo(String groupType, List userIds); } 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 e38fee5d40..f1e704be10 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 @@ -2533,6 +2533,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl disPoseUserInfo(String groupType,List userIds){ if (CollectionUtils.isEmpty(userIds)){ return new ArrayList<>(); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java index 0818ba3e16..3a187796c0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java @@ -42,6 +42,7 @@ import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.CommonDataFilterResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; +import com.epmet.dto.result.UserInfoResultDTO; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.modules.enums.AchievementTypeEnum; import com.epmet.modules.feign.EpmetUserFeignClient; @@ -61,10 +62,7 @@ import com.epmet.modules.topic.dao.ResiTopicDao; import com.epmet.modules.topic.dao.ResiTopicOperationDao; import com.epmet.modules.topic.dao.TopicDraftDao; import com.epmet.modules.topic.entity.*; -import com.epmet.modules.topic.service.TopicDraftAttachmentService; -import com.epmet.modules.topic.service.TopicDraftOperationService; -import com.epmet.modules.topic.service.TopicDraftScanTaskService; -import com.epmet.modules.topic.service.TopicDraftService; +import com.epmet.modules.topic.service.*; import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.constant.MemberStateConstant; import com.epmet.resi.group.constant.TopicConstant; @@ -159,6 +157,8 @@ public class TopicDraftServiceImpl extends BaseServiceImpl page(Map params) { @@ -641,13 +641,27 @@ public class TopicDraftServiceImpl extends BaseServiceImpl { - ResiGroupMemberInfoRedisDTO memberRedis = - resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName()); - if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){ - item.setUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName()); - } - }); + //查询小组信息 + ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId()); + if ("branch".equals(group.getGroupType())) { + List userIds = result.stream().map(m -> m.getUserName()).distinct().collect(Collectors.toList()); + List userInfos = resiTopicService.disPoseUserInfo(group.getGroupType(), userIds); + result.forEach(item -> { + userInfos.forEach(u->{ + if(item.getUserName().equals(u.getUserId())){ + item.setUserName(u.getReleaseUserName()); + } + }); + }); + } else { + result.forEach(item -> { + ResiGroupMemberInfoRedisDTO memberRedis = + resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName()); + if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){ + item.setUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName()); + } + }); + } return result; }