From a76cec91cf4adf1feede5dda61d97d2bbf18266a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 七月 2019 20:27:20 +0800
Subject: [PATCH] 加入服务绑定功能

---
 UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 48 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..60ae1ac 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
@@ -14,6 +14,7 @@
 import com.java110.dto.UserDto;
 import com.java110.user.dao.IOwnerServiceDao;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -36,6 +37,7 @@
     @Autowired
     private IOwnerServiceDao ownerServiceDaoImpl;
 
+    @Autowired
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
 
@@ -49,14 +51,39 @@
         //璋冪敤 灏忓尯鏈嶅姟鏌ヨ 灏忓尯鎴愬憳涓氫富淇℃伅
         CommunityMemberDto communityMemberDto = BeanConvertUtil.covertBean(ownerDto, CommunityMemberDto.class);
         communityMemberDto.setMemberTypeCd(CommunityMemberTypeConstant.OWNER);
+        if (StringUtils.isEmpty(communityMemberDto.getMemberId()) && !StringUtils.isEmpty(ownerDto.getOwnerId())) {
+            communityMemberDto.setMemberId(ownerDto.getOwnerId());
+        }
         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 +107,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 +155,7 @@
     }
 
     @Override
-    public int queryOwnerCountByCondition(OwnerDto ownerDto) {
+    public int queryOwnerCountByCondition(@RequestBody OwnerDto ownerDto) {
 
         //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
 
@@ -141,7 +169,7 @@
     }
 
     @Override
-    public List<OwnerDto> queryOwnersByCondition(OwnerDto ownerDto) {
+    public List<OwnerDto> queryOwnersByCondition(@RequestBody OwnerDto ownerDto) {
 //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
 
         int page = ownerDto.getPage();
@@ -150,7 +178,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;
@@ -166,6 +194,22 @@
         return owners;
     }
 
+
+    @Override
+    public int queryNoEnterRoomOwnerCount(@RequestBody OwnerDto ownerDto) {
+        return ownerServiceDaoImpl.queryNoEnterRoomOwnerCount(BeanConvertUtil.beanCovertMap(ownerDto));
+    }
+
+    @Override
+    public List<OwnerDto> queryOwnersByRoom(@RequestBody OwnerDto ownerDto) {
+        return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnersByRoom(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
+    }
+
+    @Override
+    public List<OwnerDto> queryOwnersByParkingSpace(@RequestBody OwnerDto ownerDto) {
+        return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnersByParkingSpace(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
+    }
+
     public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
         return userInnerServiceSMOImpl;
     }

--
Gitblit v1.8.0