diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 4ae87fce2f..3c620c3c72 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -2,14 +2,16 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.UserRoleFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -28,8 +30,8 @@ public interface EpmetUserFeignClient { * @Description 查询用户注册信息 * @Date 2020/3/30 10:45 **/ - @PostMapping(value = "epmetuser/userresiinfo/getUserResiInfoDTO", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); + @PostMapping(value = "epmetuser/userresiinfo/getuserresiinfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); /** * @param userRoleFormDTO @@ -40,4 +42,14 @@ public interface EpmetUserFeignClient { **/ @PostMapping(value = "epmetuser/userrole/getuserroleinfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + + /** + * @param userResiInfoListFormDTO + * @return com.epmet.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 根据userId集合，查询用户注册信息 + * @Date 2020/4/7 22:14 + **/ + @PostMapping(value = "epmetuser/userresiinfo/getuserresiinfolist", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java index cd650df6ff..6519d76517 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java @@ -3,9 +3,10 @@ package com.epmet.modules.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.UserRoleFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import org.springframework.stereotype.Component; @@ -21,7 +22,7 @@ import java.util.List; public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { @Override - public Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { + public Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoDTO", userResiInfoFormDTO); } @@ -29,4 +30,9 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { public Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoleInfo", userRoleFormDTO); } + + @Override + public Result> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO); + } } 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 92fe240414..a37bf1aa7a 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 @@ -30,6 +30,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserRoleFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; @@ -244,7 +245,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl().error(ModuleConstant.GETGROUPSUMMARIZE_FAILED); } //获取组长信息 - Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId()); + Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId()); if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); } else { @@ -260,7 +261,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl getGroupLeaderUserInfo(String groupId) { + private Result getGroupLeaderUserInfo(String groupId) { //群主名称需要调用feign查询 ResiGroupEntity resiGroupEntity = baseDao.selectById(groupId); if (null == resiGroupEntity) { @@ -370,7 +371,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + Result result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) { logger.info("居民注册信息查询失败"); return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName()); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index 81928c869a..1746b9b648 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java @@ -31,6 +31,7 @@ import com.epmet.constant.ReadFlagConstant; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.MessageFeignClient; import com.epmet.modules.constant.UserMessageConstant; import com.epmet.modules.feign.EpmetUserFeignClient; @@ -203,7 +204,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl groupLeaderUserInfo = this.getGroupLeaderUserInfo(linkGroupInfoResultDTO.getGroupId()); + Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(linkGroupInfoResultDTO.getGroupId()); if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { linkGroupInfoResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName()); } else { @@ -219,7 +220,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl getGroupLeaderUserInfo(String groupId) { + private Result getGroupLeaderUserInfo(String groupId) { //群主名称需要调用feign查询 ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupId); if (null == resiGroupEntity) { @@ -319,7 +320,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl userResiInfoDTOResult=epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); + Result userResiInfoDTOResult=epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); if(!userResiInfoDTOResult.success()||null==userResiInfoDTOResult.getData()){ return ; } 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 56740b7cc4..b46c945e56 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 @@ -29,6 +29,8 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.ReadFlagConstant; import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.dto.form.UserResiInfoListFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.MessageFeignClient; import com.epmet.modules.constant.UserMessageConstant; import com.epmet.modules.feign.EpmetUserFeignClient; @@ -55,6 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -210,10 +213,25 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl list = baseDao.selectListGroupMember(groupMemberListFormDTO); if (null != list && list.size() > 0) { + List userIdList=new ArrayList<>(); for (GroupMemberListResultDTO groupMemberListResultDTO : list) { - groupMemberListResultDTO.setUserShowName("测试昵称"); - groupMemberListResultDTO.setHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132"); - +// groupMemberListResultDTO.setUserShowName("测试昵称"); +// groupMemberListResultDTO.setHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132"); + userIdList.add(groupMemberListResultDTO.getUserId()); + } + UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); + formDTO.setUserIdList(userIdList); + Result> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); + if(userResiInfoDTOListResult.success()){ + for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ + for (GroupMemberListResultDTO groupMember : list) { + if(groupMember.getUserId().equals(userResiInfo.getUserId())){ + groupMember.setUserShowName(userResiInfo.getShowName()); + groupMember.setHeadPhoto(userResiInfo.getHeadPhoto()); + break; + } + } + } } } return new Result>().ok(list); @@ -232,10 +250,27 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl list = baseDao.selectListApplyingMember(applyingMemberFormDTO); if (null != list && list.size() > 0) { + List userIdList=new ArrayList<>(); for (ApplyingMemberResultDTO applyingMemberResultDTO : list) { - applyingMemberResultDTO.setApplyUserName("测试昵称"); - applyingMemberResultDTO.setApplyUserHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132"); +// applyingMemberResultDTO.setApplyUserName("测试昵称"); +// applyingMemberResultDTO.setApplyUserHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132"); + userIdList.add(applyingMemberResultDTO.getApplyUserId()); } + UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); + formDTO.setUserIdList(userIdList); + Result> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); + if(userResiInfoDTOListResult.success()){ + for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ + for (ApplyingMemberResultDTO memberInfo : list) { + if(memberInfo.getApplyUserId().equals(userResiInfo.getUserId())){ + memberInfo.setApplyUserName(userResiInfo.getShowName()); + memberInfo.setApplyUserHeadPhoto(userResiInfo.getHeadPhoto()); + break; + } + } + } + } + } return new Result>().ok(list); } 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 3c54ebb021..1e76513c50 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 @@ -26,8 +26,8 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; import com.epmet.modules.group.entity.ResiGroupEntity; @@ -424,8 +424,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl userInfo = - epmetUserFeignClient.getUserResiInfoDTO(userParam); + Result userInfo = epmetUserFeignClient.getUserResiInfoDTO(userParam); if(userInfo.success()){ resultDTO.setReleaseUserName(userInfo.getData().getSurname() + userInfo.getData().getName()); @@ -515,4 +514,4 @@ public class ResiTopicServiceImpl extends BaseServiceImpl userIdList; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java new file mode 100644 index 0000000000..8c846a621a --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java @@ -0,0 +1,65 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yinzuomei + * @Date 2020/4/7 18:45 + */ +@Data +public class UserResiInfoResultDTO implements Serializable { + + /** + * 唯一标识 + */ + private String id; + + /** + * 用户Id(主键) user.id + */ + private String userId; + + /** + * 手机号(注册手机号) + */ + private String regMobile; + + /** + * 姓氏 + */ + private String surname; + + /** + * 名称 + */ + private String name; + + /** + * 街道 + */ + private String street; + + /** + * 小区名称 + */ + private String district; + + /** + * 楼栋单元 + */ + private String buildingAddress; + + /** + * 用户显示名称 + */ + private String showName; + + /** + * 用户头像 + */ + private String headPhoto; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java index 862d296a49..825cc6e78b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java @@ -27,7 +27,9 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.excel.UserResiInfoExcel; import com.epmet.service.UserResiInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -100,12 +102,24 @@ public class UserResiInfoController { * @Description 查询用户注册信息 * @Date 2020/3/30 10:49 **/ - @PostMapping("getUserResiInfoDTO") - public Result getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO) { + @PostMapping("getuserresiinfo") + public Result getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO) { ValidatorUtils.validateEntity(userResiInfoFormDTO); return userResiInfoService.getUserResiInfoDTO(userResiInfoFormDTO); } + /** + * @return com.epmet.commons.tools.utils.Result> + * @param userResiInfoListFormDTO + * @Author yinzuomei + * @Description 根据userId集合查询用户注册信息 + * @Date 2020/4/7 18:24 + **/ + @PostMapping("getuserresiinfolist") + public Result> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO){ + return userResiInfoService.getUserResiInfoList(userResiInfoListFormDTO); + } + /** * @param userResiInfoDTO * @Author sun diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index 45e96e78f6..e14b927f1b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -20,8 +20,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -41,7 +43,7 @@ public interface UserResiInfoDao extends BaseDao { * @Description 查询用户注册信息 * @Date 2020/3/30 11:10 **/ - UserResiInfoDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); + UserResiInfoResultDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); /** * @Author sun @@ -49,4 +51,12 @@ public interface UserResiInfoDao extends BaseDao { **/ List selectResiInfoByMobile(String regMobile); + /** + * @return java.util.List + * @param userIdList + * @Author yinzuomei + * @Description 根据userId集合查询用户注册信息 + * @Date 2020/4/7 18:26 + **/ + List selectListUserResiInfoDTO(@Param("userIdList") List userIdList); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java index 2ea687b27a..5f0817a62e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java @@ -22,7 +22,9 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; import java.util.List; @@ -103,7 +105,7 @@ public interface UserResiInfoService extends BaseService { * @Description 查询用户注册信息 * @Date 2020/3/30 11:07 **/ - Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); + Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); /** * 居民端-居民注册信息提交 @@ -130,4 +132,13 @@ public interface UserResiInfoService extends BaseService { * @author zhaoqifeng */ Result saveResiInfo(UserResiInfoDTO userResiInfoDTO); + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param userResiInfoListFormDTO + * @Author yinzuomei + * @Description 根据userId集合查询用户注册信息 + * @Date 2020/4/7 18:21 + **/ + Result> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index a78af90ba4..986ba1a93c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -37,6 +37,7 @@ import com.epmet.dto.form.EnterGridFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.RegisterRelationEntity; import com.epmet.entity.UserCustomerEntity; @@ -232,7 +233,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { - UserResiInfoDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO); - if (null != userResiInfoDTO) { - String showName = userResiInfoDTO.getStreet() + "-" + userResiInfoDTO.getSurname() + userResiInfoDTO.getName(); - userResiInfoDTO.setShowName(showName); - } - return new Result().ok(userResiInfoDTO); + public Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { + UserResiInfoResultDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO); + return new Result().ok(userResiInfoDTO); } /** @@ -244,6 +239,23 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl> + * @Author yinzuomei + * @Description 根据userId集合查询用户注册信息 + * @Date 2020/4/7 18:21 + **/ + @Override + public Result> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) { + List list=new ArrayList<>(); + if(null==userResiInfoListFormDTO.getUserIdList()){ + return new Result>().ok(list); + } + list= baseDao.selectListUserResiInfoDTO(userResiInfoListFormDTO.getUserIdList()); + return new Result>().ok(list); + } + /** * 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据 * diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index 5d68dcef31..acc2efacfa 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -40,7 +40,7 @@ + +