From 7fb4b60a821241350e9285c7ad397b783fdcb94c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 22 五月 2019 13:32:05 +0800
Subject: [PATCH] RoomDto 中加入ownerId
---
UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java b/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
index 3d3aed3..ac616a7 100644
--- a/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
+++ b/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
@@ -36,6 +36,7 @@
@Autowired
private IOwnerServiceDao ownerServiceDaoImpl;
+ @Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@@ -51,12 +52,34 @@
communityMemberDto.setMemberTypeCd(CommunityMemberTypeConstant.OWNER);
List<CommunityMemberDto> communityMemberDtos = communityInnerServiceSMOImpl.getCommunityMembers(communityMemberDto);
+ if (communityMemberDtos == null || communityMemberDtos.size() < 1) {
+ return null;
+ }
+
Map ownerInfo = new HashMap();
ownerInfo.put("ownerIds", getOwnerIds(communityMemberDtos));
+ ownerInfo.put("ownerTypeCd", ownerDto.getOwnerTypeCd());
ownerInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
List<OwnerDto> owners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(ownerInfo), OwnerDto.class);
+ if (owners == null || owners.size() == 0) {
+ return owners;
+ }
+
+ String[] userIds = getUserIds(owners);
+ //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
+ List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+
+ for (OwnerDto owner : owners) {
+ refreshOwner(owner, users);
+ }
+ return owners;
+ }
+
+ @Override
+ public List<OwnerDto> queryOwnerMembers(@RequestBody OwnerDto ownerDto) {
+ List<OwnerDto> owners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
if (owners == null || owners.size() == 0) {
return owners;
}
@@ -80,7 +103,8 @@
private void refreshOwner(OwnerDto owner, List<UserDto> users) {
for (UserDto user : users) {
if (owner.getUserId().equals(user.getUserId())) {
- BeanConvertUtil.covertBean(user, owner);
+ //BeanConvertUtil.covertBean(user, owner);
+ owner.setUserName(user.getUserName());
}
}
}
@@ -127,7 +151,7 @@
}
@Override
- public int queryOwnerCountByCondition(OwnerDto ownerDto) {
+ public int queryOwnerCountByCondition(@RequestBody OwnerDto ownerDto) {
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
@@ -141,7 +165,7 @@
}
@Override
- public List<OwnerDto> queryOwnersByCondition(OwnerDto ownerDto) {
+ public List<OwnerDto> queryOwnersByCondition(@RequestBody OwnerDto ownerDto) {
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
int page = ownerDto.getPage();
@@ -150,7 +174,7 @@
ownerDto.setPage((page - 1) * ownerDto.getRow());
ownerDto.setRow(page * ownerDto.getRow());
}
- List<OwnerDto> owners = BeanConvertUtil.covertBeanList(
+ List<OwnerDto> owners = BeanConvertUtil.covertBeanList(
ownerServiceDaoImpl.getOwnerInfoByCondition(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
if (owners == null || owners.size() == 0) {
return owners;
--
Gitblit v1.8.0