加入业主成员信息

Api/src/main/java/com/java110/api/listener/owner/DeleteOwnerListener.java

@@ -1,5 +1,6 @@
 package com.java110.api.listener.owner;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiDataFlowListener;
@@ -63,7 +64,12 @@ public class DeleteOwnerListener extends AbstractServiceApiDataFlowListener {
 
         //添加小区楼
         businesses.add(deleteOwner(paramObj));
-        businesses.add(exitCommunityMember(paramObj));
+        if ("1001".equals(paramObj.getString("ownerTypeCd"))) {
+            //ownerId 写为 memberId
+            paramObj.put("ownerId", paramObj.getString("memberId"));
+            //小区楼添加到小区中
+            businesses.add(exitCommunityMember(paramObj));
+        }
 
 
         JSONObject paramInObj = super.restToCenterProtocol(businesses, dataFlowContext.getRequestCurrentHeaders());
@@ -90,7 +96,7 @@ public class DeleteOwnerListener extends AbstractServiceApiDataFlowListener {
         business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
         business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessOwner = new JSONObject();
-        businessOwner.put("ownerId", paramInJson.getString("ownerId"));
+        businessOwner.put("memberId", paramInJson.getString("memberId"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOwner", businessOwner);
 
         return business;
@@ -133,7 +139,7 @@ public class DeleteOwnerListener extends AbstractServiceApiDataFlowListener {
      * @param paramIn 接口请求数据
      */
     private void validate(String paramIn) {
-        Assert.jsonObjectHaveKey(paramIn, "ownerId", "请求报文中未包含ownerId");
+        Assert.jsonObjectHaveKey(paramIn, "memberId", "请求报文中未包含memberId");
         Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId");
     }
 

Api/src/main/java/com/java110/api/listener/owner/EditOwnerListener.java

@@ -59,8 +59,8 @@ public class EditOwnerListener extends AbstractServiceApiDataFlowListener {
         dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
         JSONArray businesses = new JSONArray();
 
-        if (!paramObj.containsKey("memberId")) {
-            paramObj.put("memberId", paramObj.getString("ownerId"));
+        if (!paramObj.containsKey("ownerId") || "1001".equals(paramObj.getString("ownerTypeCd"))) {
+            paramObj.put("ownerId", paramObj.getString("memberId"));
         }
         //添加小区楼
         businesses.add(editOwner(paramObj));
@@ -85,12 +85,13 @@ public class EditOwnerListener extends AbstractServiceApiDataFlowListener {
      *                "memberTypeCd": "390001200001"
      */
     private void validate(String paramIn) {
-        Assert.jsonObjectHaveKey(paramIn, "ownerId", "请求报文中未包含ownerId");
+        Assert.jsonObjectHaveKey(paramIn, "memberId", "请求报文中未包含ownerId");
         Assert.jsonObjectHaveKey(paramIn, "name", "请求报文中未包含name");
         Assert.jsonObjectHaveKey(paramIn, "userId", "请求报文中未包含userId");
         Assert.jsonObjectHaveKey(paramIn, "age", "请求报文中未包含age");
         Assert.jsonObjectHaveKey(paramIn, "link", "请求报文中未包含link");
         Assert.jsonObjectHaveKey(paramIn, "sex", "请求报文中未包含sex");
+        Assert.jsonObjectHaveKey(paramIn, "ownerTypeCd", "请求报文中未包含sex");
         Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId");
     }
 

Api/src/main/java/com/java110/api/listener/owner/QueryOwnerMembersListener.java

@@ -0,0 +1,98 @@
+package com.java110.api.listener.owner;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiDataFlowListener;
+import com.java110.common.constant.ServiceCodeConstant;
+import com.java110.common.util.Assert;
+import com.java110.common.util.BeanConvertUtil;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
+import com.java110.dto.OwnerDto;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import com.java110.vo.api.ApiOwnerDataVo;
+import com.java110.vo.api.ApiOwnerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.List;
+
+/**
+ * @ClassName OwnerDto
+ * @Description 小区楼数据层侦听类
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@Java110Listener("queryOwnerMembersListener")
+public class QueryOwnerMembersListener extends AbstractServiceApiDataFlowListener {
+
+    @Autowired
+    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_QUERY_OWNER_MEMBER;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.GET;
+    }
+
+    /**
+     * 业务层数据处理
+     *
+     * @param event 时间对象
+     */
+    @Override
+    public void soService(ServiceDataFlowEvent event) {
+        DataFlowContext dataFlowContext = event.getDataFlowContext();
+        //获取请求数据
+        JSONObject reqJson = dataFlowContext.getReqJson();
+        validateOwnerData(reqJson);
+
+        OwnerDto ownerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
+        List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+        ApiOwnerVo apiOwnerVo = new ApiOwnerVo();
+        apiOwnerVo.setOwners(BeanConvertUtil.covertBeanList(ownerDtoList, ApiOwnerDataVo.class));
+        apiOwnerVo.setTotal(ownerDtoList.size());
+        apiOwnerVo.setRecords(1);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOwnerVo), HttpStatus.OK);
+        dataFlowContext.setResponseEntity(responseEntity);
+
+    }
+
+
+
+    /**
+     * 校验查询条件是否满足条件
+     *
+     * @param reqJson 包含查询条件
+     */
+    private void validateOwnerData(JSONObject reqJson) {
+        Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息");
+        Assert.jsonObjectHaveKey(reqJson, "ownerId", "请求中未包含ownerId信息");
+        Assert.jsonObjectHaveKey(reqJson, "ownerTypeCd", "请求中未包含ownerTypeCd信息");
+
+    }
+
+    @Override
+    public int getOrder() {
+        return super.DEFAULT_ORDER;
+    }
+
+
+    public IOwnerInnerServiceSMO getOwnerInnerServiceSMOImpl() {
+        return ownerInnerServiceSMOImpl;
+    }
+
+    public void setOwnerInnerServiceSMOImpl(IOwnerInnerServiceSMO ownerInnerServiceSMOImpl) {
+        this.ownerInnerServiceSMOImpl = ownerInnerServiceSMOImpl;
+    }
+}

Api/src/main/java/com/java110/api/listener/owner/QueryOwnersListener.java

@@ -112,6 +112,7 @@ public class QueryOwnersListener extends AbstractServiceApiDataFlowListener {
         Assert.jsonObjectHaveKey(reqJson, "page", "请求中未包含page信息");
         Assert.jsonObjectHaveKey(reqJson, "row", "请求中未包含row信息");
         Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息");
+        Assert.jsonObjectHaveKey(reqJson, "ownerTypeCd", "请求中未包含ownerTypeCd信息");
         Assert.isInteger(reqJson.getString("page"), "不是有效数字");
         Assert.isInteger(reqJson.getString("row"), "不是有效数字");
 

Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java

@@ -62,14 +62,16 @@ public class SaveOwnerListener extends AbstractServiceApiDataFlowListener {
         dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
         JSONArray businesses = new JSONArray();
 
-        //生成ownerId
-        generateOwnerId(paramObj);
+        //生成memberId
+        generateMemberId(paramObj);
 
         //添加小区楼
         businesses.add(addOwner(paramObj));
 
-        //小区楼添加到小区中
-        businesses.add(addCommunityMember(paramObj));
+        if ("1001".equals(paramObj.getString("ownerTypeCd"))) {
+            //小区楼添加到小区中
+            businesses.add(addCommunityMember(paramObj));
+        }
 
         JSONObject paramInObj = super.restToCenterProtocol(businesses, dataFlowContext.getRequestCurrentHeaders());
 
@@ -87,11 +89,11 @@ public class SaveOwnerListener extends AbstractServiceApiDataFlowListener {
      *
      * @param paramObj 请求入参数据
      */
-    private void generateOwnerId(JSONObject paramObj) {
-        String ownerId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId);
-        paramObj.put("ownerId", ownerId);
-        if (!paramObj.containsKey("memberId")) {
-            paramObj.put("memberId", ownerId);
+    private void generateMemberId(JSONObject paramObj) {
+        String memberId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId);
+        paramObj.put("memberId", memberId);
+        if (!paramObj.containsKey("ownerId") || "1001".equals(paramObj.getString("ownerTypeCd"))) {
+            paramObj.put("ownerId", memberId);
         }
     }
 
@@ -166,6 +168,7 @@ public class SaveOwnerListener extends AbstractServiceApiDataFlowListener {
         Assert.jsonObjectHaveKey(paramIn, "age", "请求报文中未包含age");
         Assert.jsonObjectHaveKey(paramIn, "link", "请求报文中未包含link");
         Assert.jsonObjectHaveKey(paramIn, "sex", "请求报文中未包含sex");
+        Assert.jsonObjectHaveKey(paramIn, "ownerTypeCd", "请求报文中未包含sex");
         Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId");
     }
 

UserService/src/main/java/com/java110/user/listener/owner/AbstractOwnerBusinessServiceDataFlowListener.java

@@ -46,6 +46,7 @@ public abstract class AbstractOwnerBusinessServiceDataFlowListener extends Abstr
         businessOwnerInfo.put("userId", businessOwnerInfo.get("user_id"));
         businessOwnerInfo.put("age", businessOwnerInfo.get("age"));
         businessOwnerInfo.put("memberId", businessOwnerInfo.get("member_id"));
+        businessOwnerInfo.put("ownerTypeCd", businessOwnerInfo.get("owner_type_cd"));
         businessOwnerInfo.remove("bId");
         businessOwnerInfo.put("statusCd", statusCd);
     }
@@ -79,6 +80,7 @@ public abstract class AbstractOwnerBusinessServiceDataFlowListener extends Abstr
         currentOwnerInfo.put("userId", currentOwnerInfo.get("user_id"));
         currentOwnerInfo.put("age", currentOwnerInfo.get("age"));
         currentOwnerInfo.put("memberId", currentOwnerInfo.get("member_id"));
+        currentOwnerInfo.put("ownerTypeCd", currentOwnerInfo.get("owner_type_cd"));
 
 
         currentOwnerInfo.put("operate", StatusConstant.OPERATE_DEL);

UserService/src/main/java/com/java110/user/listener/owner/SaveOwnerInfoListener.java

@@ -93,7 +93,7 @@ public class SaveOwnerInfoListener extends AbstractOwnerBusinessServiceDataFlowL
         if (businessOwnerInfo != null && businessOwnerInfo.size() > 0) {
             ownerServiceDaoImpl.saveOwnerInfoInstance(info);
             if (businessOwnerInfo.size() == 1) {
-                dataFlowContext.addParamOut("ownerId", businessOwnerInfo.get(0).get("owner_id"));
+                dataFlowContext.addParamOut("memberId", businessOwnerInfo.get(0).get("member_id"));
             }
         }
     }
@@ -144,7 +144,7 @@ public class SaveOwnerInfoListener extends AbstractOwnerBusinessServiceDataFlowL
 
         }
 
-        if (businessOwner.getString("ownerId").startsWith("-")) {
+        if ("1001".equals(businessOwner.getString("ownerTypeCd"))) {
             businessOwner.put("ownerId", tmpMemberId);
 
         }

UserService/src/main/java/com/java110/user/listener/owner/UpdateOwnerInfoListener.java

@@ -79,7 +79,7 @@ public class UpdateOwnerInfoListener extends AbstractOwnerBusinessServiceDataFlo
                     JSONObject businessOwner = businessOwners.getJSONObject(_ownerIndex);
                     doBusinessOwner(business, businessOwner);
                     if (_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("ownerId", businessOwner.getString("ownerId"));
+                        dataFlowContext.addParamOut("memberId", businessOwner.getString("memberId"));
                     }
                 }
             }

UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java

@@ -76,6 +76,23 @@ public class OwnerInnerServiceSMOImpl extends BaseServiceSMO implements IOwnerIn
         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;
+        }
+
+        String[] userIds = getUserIds(owners);
+        //根据 userId 查询用户信息
+        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+
+        for (OwnerDto owner : owners) {
+            refreshOwner(owner, users);
+        }
+        return owners;
+    }
+
     /**
      * 从用户列表中查询用户，将用户中的信息 刷新到 floor对象中
      *

WebService/src/main/java/com/java110/web/components/owner/ListOwnerComponent.java

@@ -17,6 +17,7 @@ public class ListOwnerComponent {
 
     /**
      * 查询小区楼信息
+     *
      * @param pd 页面封装对象 包含页面请求数据
      * @return ResponseEntity对象返回给页面
      */

WebService/src/main/java/com/java110/web/components/owner/ListOwnerMemberComponent.java

@@ -0,0 +1,35 @@
+package com.java110.web.components.owner;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.IOwnerServiceSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 查询业主成员组件
+ */
+@Component("listOwnerMember")
+public class ListOwnerMemberComponent {
+
+    @Autowired
+    private IOwnerServiceSMO ownerServiceSMOImpl;
+
+    /**
+     * 查询小区楼信息
+     * @param pd 页面封装对象 包含页面请求数据
+     * @return ResponseEntity对象返回给页面
+     */
+    public ResponseEntity<String> list(IPageData pd) {
+
+        return ownerServiceSMOImpl.listOwnerMember(pd);
+    }
+
+    public IOwnerServiceSMO getOwnerServiceSMOImpl() {
+        return ownerServiceSMOImpl;
+    }
+
+    public void setOwnerServiceSMOImpl(IOwnerServiceSMO ownerServiceSMOImpl) {
+        this.ownerServiceSMOImpl = ownerServiceSMOImpl;
+    }
+}

WebService/src/main/java/com/java110/web/smo/IOwnerServiceSMO.java

@@ -16,6 +16,14 @@ public interface IOwnerServiceSMO {
      */
     ResponseEntity<String> listOwner(IPageData pd);
 
+    /**
+     * 查询业主成员
+     *
+     * @param pd 页面数据封装对象
+     * @return 返回 ResponseEntity对象包含 http状态 信息 body信息
+     */
+    public ResponseEntity<String> listOwnerMember(IPageData pd);
+
     /**
      * 添加小区楼信息
      *

WebService/src/main/java/com/java110/web/smo/impl/OwnerServiceSMOImpl.java

@@ -30,7 +30,6 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
     private static Logger logger = LoggerFactory.getLogger(OwnerServiceSMOImpl.class);
 
 
-
     @Autowired
     private RestTemplate restTemplate;
 
@@ -82,6 +81,44 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
         return responseEntity;
     }
 
+    /**
+     * 查询小区楼
+     *
+     * @param pd 页面数据封装对象
+     * @return 返回 ResponseEntity对象包含 http状态 信息 body信息
+     */
+    @Override
+    public ResponseEntity<String> listOwnerMember(IPageData pd) {
+
+        validateListOwnerMember(pd);
+
+        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        String communityId = paramIn.getString("communityId");
+
+
+        //校验用户是否有权限
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
+
+        ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            return responseEntity;
+        }
+        Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "根据用户ID查询商户ID失败，未包含storeId节点");
+        Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "根据用户ID查询商户类型失败，未包含storeTypeCd节点");
+
+        String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+        String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+        //数据校验是否 商户是否入驻该小区
+        super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/owner.queryOwnerMembers" + mapToUrlParam(paramIn);
+
+
+        responseEntity = this.callCenterService(restTemplate, pd, "",
+                apiUrl,
+                HttpMethod.GET);
+        return responseEntity;
+    }
+
     @Override
     public ResponseEntity<String> saveOwner(IPageData pd) {
 
@@ -91,6 +128,11 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
 
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        if (paramIn.containsKey("ownerId") && !paramIn.getString("ownerId").startsWith("-")) {
+            paramIn.put("ownerTypeCd", "1002");
+        } else {
+            paramIn.put("ownerTypeCd", "1001");
+        }
         String communityId = paramIn.getString("communityId");
         ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -126,6 +168,11 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
 
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        if (paramIn.getString("ownerId").equals(paramIn.getString("memberId"))) {
+            paramIn.put("ownerTypeCd", "1001");
+        } else {
+            paramIn.put("ownerTypeCd", "1002");
+        }
         String communityId = paramIn.getString("communityId");
         ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -152,6 +199,11 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
         //校验员工是否有权限操作
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_FLOOR);
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        if (paramIn.getString("ownerId").equals(paramIn.getString("memberId"))) {
+            paramIn.put("ownerTypeCd", "1001");
+        } else {
+            paramIn.put("ownerTypeCd", "1002");
+        }
         String communityId = paramIn.getString("communityId");
         ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -180,7 +232,9 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
     private void validateDeleteOwner(IPageData pd) {
 
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "未包含小区ID");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "未包含小区楼ID");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "memberId", "未包含业主ID");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "未包含业主ID");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "请求报文中未包含ownerTypeCd节点");
 
     }
 
@@ -191,9 +245,11 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
      */
     private void validateEditOwner(IPageData pd) {
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "未包含小区ID");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "未包含小区楼ID");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "memberId", "未包含memberId");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "未包含ownerId");
         Assert.jsonObjectHaveKey(pd.getReqData(), "name", "请求报文中未包含name");
         Assert.jsonObjectHaveKey(pd.getReqData(), "age", "请求报文中未包含age");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "请求报文中未包含ownerTypeCd节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "link", "请求报文中未包含link");
         Assert.jsonObjectHaveKey(pd.getReqData(), "sex", "请求报文中未包含sex");
         Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "未包含小区楼备注");
@@ -209,6 +265,7 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
         Assert.jsonObjectHaveKey(pd.getReqData(), "age", "请求报文中未包含age");
         Assert.jsonObjectHaveKey(pd.getReqData(), "name", "请求报文中未包含name");
         Assert.jsonObjectHaveKey(pd.getReqData(), "link", "请求报文中未包含link");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "请求报文中未包含ownerTypeCd节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "sex", "请求报文中未包含sex");
         Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "未包含小区楼备注");
     }
@@ -221,6 +278,7 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
     private void validateListOwner(IPageData pd) {
         Assert.jsonObjectHaveKey(pd.getReqData(), "page", "请求报文中未包含page节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "row", "请求报文中未包含row节点");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerTypeCd", "请求报文中未包含ownerTypeCd节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "请求报文中未包含communityId节点");
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
         Assert.isInteger(paramIn.getString("page"), "page不是数字");
@@ -234,6 +292,19 @@ public class OwnerServiceSMOImpl extends BaseComponentSMO implements IOwnerServi
         }
 
     }
+    /**
+     * 校验查询小区楼信息
+     *
+     * @param pd 页面封装对象
+     */
+    private void validateListOwnerMember(IPageData pd) {
+        Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "请求报文中未包含ownerId节点");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "请求报文中未包含communityId节点");
+        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        Assert.hasLength(paramIn.getString("communityId"), "小区ID不能为空");
+
+    }
+
 
     public RestTemplate getRestTemplate() {
         return restTemplate;

WebService/src/main/resources/components/add-owner/addOwner.js

@@ -7,14 +7,18 @@
                 age:'',
                 link:'',
                 sex:'',
-                remark:''
+                remark:'',
+                ownerId:''
             }
         },
          _initMethod:function(){
 
          },
          _initEvent:function(){
-            vc.on('addOwner','openAddOwnerModal',function(){
+            vc.on('addOwner','openAddOwnerModal',function(_ownerId){
+                if(_ownerId != null || _ownerId != -1){
+                    vc.component.addOwnerInfo.ownerId = _ownerId;
+                }
                 $('#addOwnerModel').modal('show');
             });
         },

WebService/src/main/resources/components/edit-owner/editOwner.js

@@ -4,6 +4,7 @@
         data:{
             editOwnerInfo:{
                 ownerId:'',
+                memberId:'',
                 name:'',
                 age:'',
                 link:'',
@@ -87,8 +88,6 @@
                     return ;
                 }
 
-                vc.component.editOwnerInfo.errorInfo = "";
-
                 vc.component.editOwnerInfo.communityId = vc.getCurrentCommunity().communityId;
                 vc.http.post(
                     'editOwner',
@@ -118,6 +117,7 @@
             clearEditOwnerInfo:function(){
                 vc.component.editOwnerInfo = {
                     ownerId:'',
+                    memberId:'',
                     name:'',
                     age:'',
                     link:'',

WebService/src/main/resources/components/list-owner-member/listOwnerMember.html

@@ -0,0 +1,72 @@
+<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
+    <vc:create name="memberSelectOwner"></vc:create>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-content">
+
+                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                        <thead>
+                        <tr>
+                            <th>业主ID</th>
+                            <th data-hide="phone">名称</th>
+                            <th data-hide="phone">性别</th>
+                            <th data-hide="phone">年龄</th>
+                            <th data-hide="phone">联系方式</th>
+                            <th data-hide="phone">创建员工</th>
+                            <th data-hide="phone">备注</th>
+                            <th class="text-right">操作</th>
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr v-for="owner in memberInfo.members">
+                            <td>
+                                {{owner.memberId}}
+                            </td>
+
+                            <td>
+                                {{owner.name}}
+                            </td>
+                            <td>
+                                {{owner.sex == 0 ? '男' : '女'}}
+                            </td>
+                            <td>
+                                {{owner.age}}
+                            </td>
+                            <td>
+                                {{owner.link}}
+                            </td>
+                            <td>
+                                {{owner.userName}}
+                            </td>
+                            <td>
+                                {{owner.remark}}
+                            </td>
+                            <td class="text-right">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openEditOwnerModel(owner)">修改</button>
+                                </div>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openDelOwnerModel(owner)">删除</button>
+                                </div>
+                            </td>
+                        </tr>
+                        </tbody>
+                        <tfoot>
+                        <tr>
+                            <td colspan="7">
+                                <ul class="pagination float-right"></ul>
+                            </td>
+                        </tr>
+                        </tfoot>
+                    </table>
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- 删除员工权限 -->
+    <vc:create name="editOwner"></vc:create>
+    <vc:create name="deleteOwner"></vc:create>
+</div>

WebService/src/main/resources/components/list-owner-member/listOwnerMember.js

@@ -0,0 +1,57 @@
+(function(vc){
+    //员工权限
+    vc.extends({
+        data:{
+            memberInfo:{
+                members:[],
+                _currentOwnerId:'',
+            }
+        },
+        _initMethod:function(){
+
+        },
+        _initEvent:function(){
+
+            vc.on('member','loadOwner',function(_param){
+                vc.component._loadOwners(_param);
+            });
+            vc.on('member','loadData',function(_param){
+                vc.component._loadOwners(_param);
+            });
+        },
+        methods:{
+            _loadOwners:function(_param){
+                vc.component.memberInfo._currentOwnerId=_param.ownerId;
+                var param = {
+                    params:{
+                        page:1,
+                        row:15,
+                        ownerId:_param.memberId,
+                        communityId:vc.getCurrentCommunity().communityId,
+                        ownerTypeCd:'1002'
+                    }
+                };
+             //发送get请求
+            vc.http.get('listOwnerMember',
+                         'list',
+                          param,
+                          function(json){
+                             var _memberInfo = JSON.parse(json);
+                             vc.component.memberInfo.members = _memberInfo;
+
+                          },function(){
+                             console.log('请求失败处理');
+                          });
+            },
+            _openDeleteOwnerModel:function(_member){
+                _member.ownerId = vc.component.memberInfo._currentOwnerId;
+                vc.emit('deleteOwner','openOwnerModel',_member);
+            },
+            _openEditOwnerModel:function(_member){
+                _member.ownerId = vc.component.memberInfo._currentOwnerId;
+                vc.emit('editOwner','openOwnerModel',_member);
+            }
+        }
+    });
+
+})(window.vc);

WebService/src/main/resources/components/list-owner/listOwner.html

@@ -5,7 +5,7 @@
                 <div class="ibox-title">
                     <h5>业主信息</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOwnerModal()">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOwnerModal(-1)">
                             <i class="glyphicon glyphicon-plus"></i>
                             添加业主
                         </button>

WebService/src/main/resources/components/list-owner/listOwner.js

@@ -27,7 +27,8 @@
                     params:{
                         page:_page,
                         row:_row,
-                        communityId:vc.getCurrentCommunity().communityId
+                        communityId:vc.getCurrentCommunity().communityId,
+                        ownerTypeCd:'1001'
                     }
                 }
 

WebService/src/main/resources/components/member-select-owner/memberSelectOwner.html

@@ -0,0 +1,73 @@
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox ">
+            <div class="ibox-title">
+                <h5>小区楼信息</h5>
+                <div class="ibox-tools" style="top:10px;">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="openSearchOwnerModel()">
+                        <i class="glyphicon glyphicon-search"></i> 选择业主</button>
+                    <button type="button" class="btn btn-primary btn-sm"
+                            v-if="ownerInfo.ownerId != null && ownerInfo.ownerId != ''"
+                            style="margin-left:10px" v-on:click="openAddMemberModel()">
+                        <i class="glyphicon glyphicon-plus" ></i> 添加成员</button>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label" >业主ID：</label>
+                            <label class="">{{ownerInfo.ownerId}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label">名称：</label>
+                            <label class="">{{ownerInfo.name}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label" >性别：</label>
+                            <label class="">{{ownerInfo.sex == 0 ? '男' ：'女'}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label" >年龄：</label>
+                            <label class="">{{ownerInfo.age}}</label>
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="row">
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label" >联系方式：</label>
+                            <label class="">{{ownerInfo.link}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="form-group">
+                            <label class="col-form-label">创建员工：</label>
+                            <label class="">{{ownerInfo.userName}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="col-form-label" >备注：</label>
+                            <label class="">{{ownerInfo.remark}}</label>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <vc:create name="searchOwner"
+               emitChooseOwner="memberSelectOwner"
+               emitLoadData="member"
+    ></vc:create>
+    <vc:create name="addOwner"></vc:create>
+</div>

WebService/src/main/resources/components/member-select-owner/memberSelectOwner.js

@@ -0,0 +1,40 @@
+/**
+    权限组
+**/
+(function(vc){
+
+    vc.extends({
+        data:{
+            ownerInfo:{
+                ownerId:"",
+                name:"",
+                age:"",
+                sex:"",
+                userName:"",
+                remark:"",
+                link:"",
+            }
+        },
+        _initMethod:function(){
+
+        },
+        _initEvent:function(){
+            vc.on('ownerSelectOwner','chooseOwner',function(_owner){
+                vc.component.ownerInfo = _owner;
+            });
+
+        },
+        methods:{
+
+            openSearchOwnerModel(){
+                vc.emit('searchOwner','openSearchOwnerModel',{});
+            },
+            openAddOwnerModel(){
+                vc.emit('addOwner','addOwnerModel',{
+                    ownerId:vc.component.ownerInfo.ownerId
+                });
+            }
+        }
+    });
+
+})(window.vc);

WebService/src/main/resources/components/search-owner/searchOwner.html

@@ -0,0 +1,80 @@
+<div id = "searchOwnerModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="searchOwnerModelLabel" aria-hidden="true" >
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3 class="modal-title" id="searchOwnerModelLabel">选择业主</h3>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class=" row">
+                    <div class="col-lg-12">
+                        <div class="ibox ">
+                            <div class="row">
+
+                                <div class="col-sm-7 m-b-xs">
+
+                                </div>
+                                <div class="col-sm-5">
+                                    <div class="input-group">
+                                        <input placeholder="输入业主名称" type="text" v-model="searchOwnerInfo._currentOwnerName" class="form-control form-control-sm">
+                                        <span class="input-group-append">
+                                                <button type="button" class="btn btn-sm btn-primary" v-on:click="searchOwners()">查询</button>
+                                            </span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="table-responsive" style="margin-top:15px">
+                                <table class="table table-striped">
+                                    <thead>
+                                    <tr>
+                                        <th>业主ID</th>
+                                        <th>名称</th>
+                                        <th>性别</th>
+                                        <th>年龄</th>
+                                        <th>联系方式</th>
+                                        <th>创建员工</th>
+                                        <th>备注</th>
+                                        <th>操作</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr v-for="owner in searchOwnerInfo.owners">
+                                        <td>
+                                            {{owner.memberId}}
+                                        </td>
+
+                                        <td>
+                                            {{owner.name}}
+                                        </td>
+                                        <td>
+                                            {{owner.sex == 0 ? '男' : '女'}}
+                                        </td>
+                                        <td>
+                                            {{owner.age}}
+                                        </td>
+                                        <td>
+                                            {{owner.link}}
+                                        </td>
+                                        <td>
+                                            {{owner.userName}}
+                                        </td>
+                                        <td>
+                                            {{owner.remark}}
+                                        </td>
+                                        <td>
+                                            <button class="btn btn-primary btn-xs" v-on:click="chooseOwner(owner)">选择</button>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/search-owner/searchOwner.js

@@ -0,0 +1,63 @@
+(function(vc){
+    vc.extends({
+        propTypes: {
+           emitChooseOwner:vc.propTypes.string,
+           emitLoadData:vc.propTypes.string
+        },
+        data:{
+            searchOwnerInfo:{
+                owners:[],
+                _currentOwnerName:'',
+            }
+        },
+        _initMethod:function(){
+
+        },
+        _initEvent:function(){
+            vc.on('searchOwner','openSearchOwnerModel',function(_param){
+                console.log("打开业主成员界面")
+                $('#searchOwnerModel').modal('show');
+                vc.component._refreshSearchOwnerData();
+                vc.component._loadAllOwnerInfo(1,10);
+            });
+        },
+        methods:{
+            _loadAllOwnerInfo:function(_page,_row,_name){
+                var param = {
+                    params:{
+                        page:_page,
+                        row:_row,
+                        communityId:vc.getCurrentCommunity().communityId,
+                        name:_name
+                    }
+                };
+
+                //发送get请求
+               vc.http.get('searchOwner',
+                            'listOwner',
+                             param,
+                             function(json){
+                                var _ownerInfo = JSON.parse(json);
+                                vc.component.searchOwnerInfo.owners = _ownerInfo.owners;
+                             },function(){
+                                console.log('请求失败处理');
+                             }
+                           );
+            },
+            chooseOwner:function(_owner){
+                vc.emit($props.emitChooseOwner,'chooseOwner',_owner);
+                vc.emit($props.emitLoadData,'loadData',{
+                    ownerId:_owner.ownerId
+                });
+                $('#searchOwnerModel').modal('hide');
+            },
+            searchOwners:function(){
+                vc.component._loadAllOwnerInfo(1,10,vc.component.searchOwnerInfo._currentOwnerName);
+            },
+            _refreshSearchOwnerData:function(){
+                vc.component.searchOwnerInfo._currentOwnerName = "";
+            }
+        }
+
+    });
+})(window.vc);

WebService/src/main/resources/views/ownerMemberFlow.html

@@ -20,7 +20,7 @@
         </div>
         <!-- id="component" -->
         <div class="wrapper wrapper-content animated fadeInRight">
-            <vc:create name="listOwner"></vc:create>
+            <vc:create name="listOwnerMember"></vc:create>
         </div>
 
         <vc:create name="copyright"></vc:create>

java110-common/src/main/java/com/java110/common/constant/ServiceCodeConstant.java

@@ -398,6 +398,9 @@ public class ServiceCodeConstant {
     //查询业主
     public static final String SERVICE_CODE_QUERY_OWNER = "owner.queryOwners";
 
+    //查询业主成员
+    public static final String SERVICE_CODE_QUERY_OWNER_MEMBER = "owner.queryOwnerMembers";
+
     // 保存业主信息
     public static final String SERVICE_CODE_SAVE_OWNER = "owner.saveOwner";
 

java110-core/src/main/java/com/java110/core/smo/owner/IOwnerInnerServiceSMO.java

@@ -31,6 +31,16 @@ public interface IOwnerInnerServiceSMO {
     @RequestMapping(value = "/queryOwners", method = RequestMethod.POST)
     List<OwnerDto> queryOwners(@RequestBody OwnerDto ownerDto);
 
+    /**
+     * <p>查询业主成员</p>
+     *
+     *
+     * @param ownerDto 数据对象分享
+     * @return OwnerDto 对象数据
+     */
+    @RequestMapping(value = "/queryOwnerMembers", method = RequestMethod.POST)
+    List<OwnerDto> queryOwnerMembers(@RequestBody OwnerDto ownerDto);
+
     /**
      * 查询<p>小区楼</p>总记录数
      *

java110-db/src/main/resources/mapper/owner/OwnerServiceDaoImplMapper.xml

@@ -7,16 +7,17 @@
     <!-- 保存业主信息 add by wuxw 2018-07-03 -->
        <insert id="saveBusinessOwnerInfo" parameterType="Map">
            insert into business_building_owner(
-operate,sex,name,link,remark,owner_id,b_id,user_id,age,member_id
+operate,sex,name,link,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd
 ) values (
-#{operate},#{sex},#{name},#{link},#{remark},#{ownerId},#{bId},#{userId},#{age},#{memberId}
+#{operate},#{sex},#{name},#{link},#{remark},#{ownerId},#{bId},#{userId},#{age},#{memberId},#{ownerTypeCd}
 )
        </insert>
 
 
        <!-- 查询业主信息（Business） add by wuxw 2018-07-03 -->
        <select id="getBusinessOwnerInfo" parameterType="Map" resultType="Map">
-           select  t.operate,t.sex,t.name,t.link,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId 
+           select  t.operate,t.sex,t.name,t.link,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,
+           t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd t.ownerTypeCd
 from business_building_owner t 
 where 1 =1 
 <if test="operate !=null and operate != ''">
@@ -48,7 +49,10 @@ where 1 =1
 </if> 
 <if test="memberId !=null and memberId != ''">
    and t.member_id= #{memberId}
-</if> 
+</if>
+           <if test="ownerTypeCd !=null and ownerTypeCd != ''">
+   and t.owner_type_cd= #{ownerTypeCd}
+</if>
 
        </select>
 
@@ -60,7 +64,8 @@ where 1 =1
     <insert id="saveOwnerInfoInstance" parameterType="Map">
         insert into building_owner(
 sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id
-) select t.sex,t.name,t.link,'0',t.remark,t.owner_id,t.b_id,t.user_id,t.age,t.member_id from business_building_owner t where 1=1
+) select t.sex,t.name,t.link,'0',t.remark,t.owner_id,t.b_id,t.user_id,t.age,t.member_id,t.owner_type_cd
+        from business_building_owner t where 1=1
    and t.operate= 'ADD'
 <if test="sex !=null and sex != ''">
    and t.sex= #{sex}
@@ -88,7 +93,10 @@ sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id
 </if> 
 <if test="memberId !=null and memberId != ''">
    and t.member_id= #{memberId}
-</if> 
+</if>
+        <if test="ownerTypeCd !=null and ownerTypeCd != ''">
+            and t.owner_type_cd= #{ownerTypeCd}
+        </if>
 
     </insert>
 
@@ -98,7 +106,7 @@ sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id
     <select id="getOwnerInfo" parameterType="Map" resultType="Map">
         select  t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,
         t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,
-        t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId
+        t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd t.ownerTypeCd
 from building_owner t 
 where 1 =1 
 <if test="sex !=null and sex != ''">
@@ -137,6 +145,9 @@ where 1 =1
                 #{item}
             </foreach>
         </if>
+        <if test="ownerTypeCd !=null and ownerTypeCd != ''">
+            and t.owner_type_cd= #{ownerTypeCd}
+        </if>
 <if test="page != -1 and page != null ">
    limit #{page}, #{row}
 </if> 
@@ -215,7 +226,10 @@ and t.member_id= #{memberId}
 </if> 
 <if test="memberId !=null and memberId != ''">
    and t.member_id= #{memberId}
-</if> 
+</if>
+         <if test="ownerTypeCd !=null and ownerTypeCd != ''">
+             and t.owner_type_cd= #{ownerTypeCd}
+         </if>
 
 
      </select>
@@ -259,6 +273,9 @@ and t.member_id= #{memberId}
         <if test="memberId !=null and memberId != ''">
             and t.member_id= #{memberId}
         </if>
+        <if test="ownerTypeCd !=null and ownerTypeCd != ''">
+            and t.owner_type_cd= #{ownerTypeCd}
+        </if>
 
 
     </select>
@@ -266,7 +283,8 @@ and t.member_id= #{memberId}
 
     <!-- 查询业主信息 add by wuxw 2018-07-03 -->
     <select id="getOwnerInfoByCondition" parameterType="Map" resultType="Map">
-    select  t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId
+    select  t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,
+        t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd t.ownerTypeCd
         FROM building_owner t , s_community_member cm
         WHERE t.`member_id` = cm.`member_id`
         AND cm.`community_id` = #{communityId}
@@ -308,6 +326,9 @@ and t.member_id= #{memberId}
             #{item}
         </foreach>
     </if>
+        <if test="ownerTypeCd !=null and ownerTypeCd != ''">
+            and t.owner_type_cd= #{ownerTypeCd}
+        </if>
     <if test="page != -1 and page != null ">
         limit #{page}, #{row}
     </if>