吴学文 лет назад: 7
Родитель
Сommit
511f71d51d
23 измененных файлов с 1845 добавлено и 74 удалено
  1. 76 0
      UserService/src/main/java/com/java110/user/dao/IOwnerRoomRelServiceDao.java
  2. 134 0
      UserService/src/main/java/com/java110/user/dao/impl/OwnerRoomRelServiceDaoImpl.java
  3. 85 0
      UserService/src/main/java/com/java110/user/listener/ownerRoomRel/AbstractOwnerRoomRelBusinessServiceDataFlowListener.java
  4. 180 0
      UserService/src/main/java/com/java110/user/listener/ownerRoomRel/DeleteOwnerRoomRelInfoListener.java
  5. 180 0
      UserService/src/main/java/com/java110/user/listener/ownerRoomRel/SaveOwnerRoomRelInfoListener.java
  6. 190 0
      UserService/src/main/java/com/java110/user/listener/ownerRoomRel/UpdateOwnerRoomRelInfoListener.java
  7. 112 0
      UserService/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java
  8. 6 0
      docs/_sidebar.md
  9. 7 10
      docs/api/owner/deleteUnit.md
  10. 9 7
      docs/api/owner/saveOwner.md
  11. 22 18
      docs/api/owner/updateUnit.md
  12. 114 0
      docs/services/owner/DeleteOwnerRoomRelInfo.md
  13. 123 0
      docs/services/owner/SaveOwnerRoomRelInfo.md
  14. 124 0
      docs/services/owner/UpdateOwnerRoomRelInfo.md
  15. 82 0
      java110-bean/src/main/java/com/java110/dto/OwnerRoomRelDto.java
  16. 81 0
      java110-code-generator/src/main/java/com/java110/OwnerRoomRelGeneratorApplication.java
  17. 3 3
      java110-code-generator/src/main/java/com/java110/code/GeneratorSaveInfoListener.java
  18. 18 0
      java110-common/src/main/java/com/java110/common/constant/BusinessTypeConstant.java
  19. 1 0
      java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
  20. 42 0
      java110-core/src/main/java/com/java110/core/smo/owner/IOwnerRoomRelInnerServiceSMO.java
  21. 0 36
      java110-db/db/CommunityService/create_owner.sql
  22. 70 0
      java110-db/db/UserService/create_owner.sql
  23. 186 0
      java110-db/src/main/resources/mapper/owner/OwnerRoomRelServiceDaoImplMapper.xml

+ 76 - 0
UserService/src/main/java/com/java110/user/dao/IOwnerRoomRelServiceDao.java

@@ -0,0 +1,76 @@
+package com.java110.user.dao;
+
+
+import com.java110.common.exception.DAOException;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 业主房屋组件内部之间使用,没有给外围系统提供服务能力
+ * 业主房屋服务接口类,要求全部以字符串传输,方便微服务化
+ * 新建客户,修改客户,删除客户,查询客户等功能
+ *
+ * Created by wuxw on 2016/12/27.
+ */
+public interface IOwnerRoomRelServiceDao {
+
+    /**
+     * 保存 业主房屋信息
+     * @param businessOwnerRoomRelInfo 业主房屋信息 封装
+     * @throws DAOException 操作数据库异常
+     */
+    void saveBusinessOwnerRoomRelInfo(Map businessOwnerRoomRelInfo) throws DAOException;
+
+
+
+    /**
+     * 查询业主房屋信息(business过程)
+     * 根据bId 查询业主房屋信息
+     * @param info bId 信息
+     * @return 业主房屋信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getBusinessOwnerRoomRelInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 保存 业主房屋信息 Business数据到 Instance中
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveOwnerRoomRelInfoInstance(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询业主房屋信息(instance过程)
+     * 根据bId 查询业主房屋信息
+     * @param info bId 信息
+     * @return 业主房屋信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getOwnerRoomRelInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改业主房屋信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateOwnerRoomRelInfoInstance(Map info) throws DAOException;
+
+
+    /**
+     * 查询业主房屋总数
+     *
+     * @param info 业主房屋信息
+     * @return 业主房屋数量
+     */
+    int queryOwnerRoomRelsCount(Map info);
+
+}

+ 134 - 0
UserService/src/main/java/com/java110/user/dao/impl/OwnerRoomRelServiceDaoImpl.java

@@ -0,0 +1,134 @@
+package com.java110.user.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.ResponseConstant;
+import com.java110.common.exception.DAOException;
+import com.java110.common.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.user.dao.IOwnerRoomRelServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 业主房屋服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("ownerRoomRelServiceDaoImpl")
+//@Transactional
+public class OwnerRoomRelServiceDaoImpl extends BaseServiceDao implements IOwnerRoomRelServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(OwnerRoomRelServiceDaoImpl.class);
+
+    /**
+     * 业主房屋信息封装
+     *
+     * @param businessOwnerRoomRelInfo 业主房屋信息 封装
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveBusinessOwnerRoomRelInfo(Map businessOwnerRoomRelInfo) throws DAOException {
+        businessOwnerRoomRelInfo.put("month", DateUtil.getCurrentMonth());
+        // 查询business_user 数据是否已经存在
+        logger.debug("保存业主房屋信息 入参 businessOwnerRoomRelInfo : {}", businessOwnerRoomRelInfo);
+        int saveFlag = sqlSessionTemplate.insert("ownerRoomRelServiceDaoImpl.saveBusinessOwnerRoomRelInfo", businessOwnerRoomRelInfo);
+
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存业主房屋数据失败:" + JSONObject.toJSONString(businessOwnerRoomRelInfo));
+        }
+    }
+
+
+    /**
+     * 查询业主房屋信息
+     *
+     * @param info bId 信息
+     * @return 业主房屋信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getBusinessOwnerRoomRelInfo(Map info) throws DAOException {
+
+        logger.debug("查询业主房屋信息 入参 info : {}", info);
+
+        List<Map> businessOwnerRoomRelInfos = sqlSessionTemplate.selectList("ownerRoomRelServiceDaoImpl.getBusinessOwnerRoomRelInfo", info);
+
+        return businessOwnerRoomRelInfos;
+    }
+
+
+    /**
+     * 保存业主房屋信息 到 instance
+     *
+     * @param info bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveOwnerRoomRelInfoInstance(Map info) throws DAOException {
+        logger.debug("保存业主房屋信息Instance 入参 info : {}", info);
+
+        int saveFlag = sqlSessionTemplate.insert("ownerRoomRelServiceDaoImpl.saveOwnerRoomRelInfoInstance", info);
+
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存业主房屋信息Instance数据失败:" + JSONObject.toJSONString(info));
+        }
+    }
+
+
+    /**
+     * 查询业主房屋信息(instance)
+     *
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getOwnerRoomRelInfo(Map info) throws DAOException {
+        logger.debug("查询业主房屋信息 入参 info : {}", info);
+
+        List<Map> businessOwnerRoomRelInfos = sqlSessionTemplate.selectList("ownerRoomRelServiceDaoImpl.getOwnerRoomRelInfo", info);
+
+        return businessOwnerRoomRelInfos;
+    }
+
+
+    /**
+     * 修改业主房屋信息
+     *
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateOwnerRoomRelInfoInstance(Map info) throws DAOException {
+        logger.debug("修改业主房屋信息Instance 入参 info : {}", info);
+
+        int saveFlag = sqlSessionTemplate.update("ownerRoomRelServiceDaoImpl.updateOwnerRoomRelInfoInstance", info);
+
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改业主房屋信息Instance数据失败:" + JSONObject.toJSONString(info));
+        }
+    }
+
+    /**
+     * 查询业主房屋数量
+     *
+     * @param info 业主房屋信息
+     * @return 业主房屋数量
+     */
+    @Override
+    public int queryOwnerRoomRelsCount(Map info) {
+        logger.debug("查询业主房屋数据 入参 info : {}", info);
+
+        List<Map> businessOwnerRoomRelInfos = sqlSessionTemplate.selectList("ownerRoomRelServiceDaoImpl.queryOwnerRoomRelsCount", info);
+        if (businessOwnerRoomRelInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessOwnerRoomRelInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 85 - 0
UserService/src/main/java/com/java110/user/listener/ownerRoomRel/AbstractOwnerRoomRelBusinessServiceDataFlowListener.java

@@ -0,0 +1,85 @@
+package com.java110.user.listener.ownerRoomRel;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.ResponseConstant;
+import com.java110.common.constant.StatusConstant;
+import com.java110.common.exception.ListenerExecuteException;
+import com.java110.entity.center.Business;
+import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
+import com.java110.user.dao.IOwnerRoomRelServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 业主房屋 服务侦听 父类
+ * Created by wuxw on 2018/7/4.
+ */
+public abstract class AbstractOwnerRoomRelBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
+    private static Logger logger = LoggerFactory.getLogger(AbstractOwnerRoomRelBusinessServiceDataFlowListener.class);
+
+
+    /**
+     * 获取 DAO工具类
+     *
+     * @return
+     */
+    public abstract IOwnerRoomRelServiceDao getOwnerRoomRelServiceDaoImpl();
+
+    /**
+     * 刷新 businessOwnerRoomRelInfo 数据
+     * 主要将 数据库 中字段和 接口传递字段建立关系
+     *
+     * @param businessOwnerRoomRelInfo
+     */
+    protected void flushBusinessOwnerRoomRelInfo(Map businessOwnerRoomRelInfo, String statusCd) {
+        businessOwnerRoomRelInfo.put("newBId", businessOwnerRoomRelInfo.get("b_id"));
+        businessOwnerRoomRelInfo.put("relId", businessOwnerRoomRelInfo.get("rel_id"));
+        businessOwnerRoomRelInfo.put("operate", businessOwnerRoomRelInfo.get("operate"));
+        businessOwnerRoomRelInfo.put("remark", businessOwnerRoomRelInfo.get("remark"));
+        businessOwnerRoomRelInfo.put("state", businessOwnerRoomRelInfo.get("state"));
+        businessOwnerRoomRelInfo.put("ownerId", businessOwnerRoomRelInfo.get("owner_id"));
+        businessOwnerRoomRelInfo.put("userId", businessOwnerRoomRelInfo.get("user_id"));
+        businessOwnerRoomRelInfo.put("roomId", businessOwnerRoomRelInfo.get("room_id"));
+        businessOwnerRoomRelInfo.remove("bId");
+        businessOwnerRoomRelInfo.put("statusCd", statusCd);
+    }
+
+
+    /**
+     * 当修改数据时,查询instance表中的数据 自动保存删除数据到business中
+     *
+     * @param businessOwnerRoomRel 业主房屋信息
+     */
+    protected void autoSaveDelBusinessOwnerRoomRel(Business business, JSONObject businessOwnerRoomRel) {
+//自动插入DEL
+        Map info = new HashMap();
+        info.put("relId", businessOwnerRoomRel.getString("relId"));
+        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
+        List<Map> currentOwnerRoomRelInfos = getOwnerRoomRelServiceDaoImpl().getOwnerRoomRelInfo(info);
+        if (currentOwnerRoomRelInfos == null || currentOwnerRoomRelInfos.size() != 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "未找到需要修改数据信息,入参错误或数据有问题,请检查" + info);
+        }
+
+        Map currentOwnerRoomRelInfo = currentOwnerRoomRelInfos.get(0);
+
+        currentOwnerRoomRelInfo.put("bId", business.getbId());
+
+        currentOwnerRoomRelInfo.put("relId", currentOwnerRoomRelInfo.get("rel_id"));
+        currentOwnerRoomRelInfo.put("operate", currentOwnerRoomRelInfo.get("operate"));
+        currentOwnerRoomRelInfo.put("remark", currentOwnerRoomRelInfo.get("remark"));
+        currentOwnerRoomRelInfo.put("state", currentOwnerRoomRelInfo.get("state"));
+        currentOwnerRoomRelInfo.put("ownerId", currentOwnerRoomRelInfo.get("owner_id"));
+        currentOwnerRoomRelInfo.put("userId", currentOwnerRoomRelInfo.get("user_id"));
+        currentOwnerRoomRelInfo.put("roomId", currentOwnerRoomRelInfo.get("room_id"));
+
+
+        currentOwnerRoomRelInfo.put("operate", StatusConstant.OPERATE_DEL);
+        getOwnerRoomRelServiceDaoImpl().saveBusinessOwnerRoomRelInfo(currentOwnerRoomRelInfo);
+    }
+
+
+}

+ 180 - 0
UserService/src/main/java/com/java110/user/listener/ownerRoomRel/DeleteOwnerRoomRelInfoListener.java

@@ -0,0 +1,180 @@
+package com.java110.user.listener.ownerRoomRel;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.BusinessTypeConstant;
+import com.java110.common.constant.ResponseConstant;
+import com.java110.common.constant.StatusConstant;
+import com.java110.common.exception.ListenerExecuteException;
+import com.java110.common.util.Assert;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.Business;
+import com.java110.user.dao.IOwnerRoomRelServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 删除业主房屋信息 侦听
+ * <p>
+ * 处理节点
+ * 1、businessOwnerRoomRel:{} 业主房屋基本信息节点
+ * 2、businessOwnerRoomRelAttr:[{}] 业主房屋属性信息节点
+ * 3、businessOwnerRoomRelPhoto:[{}] 业主房屋照片信息节点
+ * 4、businessOwnerRoomRelCerdentials:[{}] 业主房屋证件信息节点
+ * 协议地址 :https://github.com/java110/MicroCommunity/wiki/%E5%88%A0%E9%99%A4%E5%95%86%E6%88%B7%E4%BF%A1%E6%81%AF-%E5%8D%8F%E8%AE%AE
+ * Created by wuxw on 2018/5/18.
+ */
+@Java110Listener("deleteOwnerRoomRelInfoListener")
+@Transactional
+public class DeleteOwnerRoomRelInfoListener extends AbstractOwnerRoomRelBusinessServiceDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(DeleteOwnerRoomRelInfoListener.class);
+    @Autowired
+    IOwnerRoomRelServiceDao ownerRoomRelServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 3;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_ROOM_REL;
+    }
+
+    /**
+     * 根据删除信息 查出Instance表中数据 保存至business表 (状态写DEL) 方便撤单时直接更新回去
+     *
+     * @param dataFlowContext 数据对象
+     * @param business        当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
+
+        //处理 businessOwnerRoomRel 节点
+        if (data.containsKey("businessOwnerRoomRel")) {
+            //处理 businessOwnerRoomRel 节点
+            if (data.containsKey("businessOwnerRoomRel")) {
+                Object _obj = data.get("businessOwnerRoomRel");
+                JSONArray businessOwnerRoomRels = null;
+                if (_obj instanceof JSONObject) {
+                    businessOwnerRoomRels = new JSONArray();
+                    businessOwnerRoomRels.add(_obj);
+                } else {
+                    businessOwnerRoomRels = (JSONArray) _obj;
+                }
+                //JSONObject businessOwnerRoomRel = data.getJSONObject("businessOwnerRoomRel");
+                for (int _ownerRoomRelIndex = 0; _ownerRoomRelIndex < businessOwnerRoomRels.size(); _ownerRoomRelIndex++) {
+                    JSONObject businessOwnerRoomRel = businessOwnerRoomRels.getJSONObject(_ownerRoomRelIndex);
+                    doBusinessOwnerRoomRel(business, businessOwnerRoomRel);
+                    if (_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("relId", businessOwnerRoomRel.getString("rel_id"));
+                    }
+                }
+            }
+        }
+
+
+    }
+
+    /**
+     * 删除 instance数据
+     *
+     * @param dataFlowContext 数据对象
+     * @param business        当前业务对象
+     */
+    @Override
+    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
+        String bId = business.getbId();
+        //Assert.hasLength(bId,"请求报文中没有包含 bId");
+
+        //业主房屋信息
+        Map info = new HashMap();
+        info.put("bId", business.getbId());
+        info.put("operate", StatusConstant.OPERATE_DEL);
+
+        //业主房屋信息
+        List<Map> businessOwnerRoomRelInfos = ownerRoomRelServiceDaoImpl.getBusinessOwnerRoomRelInfo(info);
+        if (businessOwnerRoomRelInfos != null && businessOwnerRoomRelInfos.size() > 0) {
+            for (int _ownerRoomRelIndex = 0; _ownerRoomRelIndex < businessOwnerRoomRelInfos.size(); _ownerRoomRelIndex++) {
+                Map businessOwnerRoomRelInfo = businessOwnerRoomRelInfos.get(_ownerRoomRelIndex);
+                flushBusinessOwnerRoomRelInfo(businessOwnerRoomRelInfo, StatusConstant.STATUS_CD_INVALID);
+                ownerRoomRelServiceDaoImpl.updateOwnerRoomRelInfoInstance(businessOwnerRoomRelInfo);
+                dataFlowContext.addParamOut("relId", businessOwnerRoomRelInfo.get("rel_id"));
+            }
+        }
+
+    }
+
+    /**
+     * 撤单
+     * 从business表中查询到DEL的数据 将instance中的数据更新回来
+     *
+     * @param dataFlowContext 数据对象
+     * @param business        当前业务对象
+     */
+    @Override
+    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
+        String bId = business.getbId();
+        //Assert.hasLength(bId,"请求报文中没有包含 bId");
+        Map info = new HashMap();
+        info.put("bId", bId);
+        info.put("statusCd", StatusConstant.STATUS_CD_INVALID);
+
+        Map delInfo = new HashMap();
+        delInfo.put("bId", business.getbId());
+        delInfo.put("operate", StatusConstant.OPERATE_DEL);
+        //业主房屋信息
+        List<Map> ownerRoomRelInfo = ownerRoomRelServiceDaoImpl.getOwnerRoomRelInfo(info);
+        if (ownerRoomRelInfo != null && ownerRoomRelInfo.size() > 0) {
+
+            //业主房屋信息
+            List<Map> businessOwnerRoomRelInfos = ownerRoomRelServiceDaoImpl.getBusinessOwnerRoomRelInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if (businessOwnerRoomRelInfos == null || businessOwnerRoomRelInfos.size() == 0) {
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败(ownerRoomRel),程序内部异常,请检查! " + delInfo);
+            }
+            for (int _ownerRoomRelIndex = 0; _ownerRoomRelIndex < businessOwnerRoomRelInfos.size(); _ownerRoomRelIndex++) {
+                Map businessOwnerRoomRelInfo = businessOwnerRoomRelInfos.get(_ownerRoomRelIndex);
+                flushBusinessOwnerRoomRelInfo(businessOwnerRoomRelInfo, StatusConstant.STATUS_CD_VALID);
+                ownerRoomRelServiceDaoImpl.updateOwnerRoomRelInfoInstance(businessOwnerRoomRelInfo);
+            }
+        }
+    }
+
+
+    /**
+     * 处理 businessOwnerRoomRel 节点
+     *
+     * @param business             总的数据节点
+     * @param businessOwnerRoomRel 业主房屋节点
+     */
+    private void doBusinessOwnerRoomRel(Business business, JSONObject businessOwnerRoomRel) {
+
+        Assert.jsonObjectHaveKey(businessOwnerRoomRel, "relId", "businessOwnerRoomRel 节点下没有包含 relId 节点");
+
+        if (businessOwnerRoomRel.getString("relId").startsWith("-")) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "relId 错误,不能自动生成(必须已经存在的relId)" + businessOwnerRoomRel);
+        }
+        //自动插入DEL
+        autoSaveDelBusinessOwnerRoomRel(business, businessOwnerRoomRel);
+    }
+
+    public IOwnerRoomRelServiceDao getOwnerRoomRelServiceDaoImpl() {
+        return ownerRoomRelServiceDaoImpl;
+    }
+
+    public void setOwnerRoomRelServiceDaoImpl(IOwnerRoomRelServiceDao ownerRoomRelServiceDaoImpl) {
+        this.ownerRoomRelServiceDaoImpl = ownerRoomRelServiceDaoImpl;
+    }
+}

+ 180 - 0
UserService/src/main/java/com/java110/user/listener/ownerRoomRel/SaveOwnerRoomRelInfoListener.java

@@ -0,0 +1,180 @@
+
+package com.java110.user.listener.ownerRoomRel;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.BusinessTypeConstant;
+import com.java110.common.constant.StatusConstant;
+import com.java110.common.util.Assert;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.entity.center.Business;
+import com.java110.user.dao.IOwnerRoomRelServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 保存 业主房屋信息 侦听
+ * Created by wuxw on 2018/5/18.
+ */
+@Java110Listener("saveOwnerRoomRelInfoListener")
+@Transactional
+public class SaveOwnerRoomRelInfoListener extends AbstractOwnerRoomRelBusinessServiceDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(SaveOwnerRoomRelInfoListener.class);
+
+    @Autowired
+    private IOwnerRoomRelServiceDao ownerRoomRelServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_ROOM_REL;
+    }
+
+    /**
+     * 保存业主房屋信息 business 表中
+     *
+     * @param dataFlowContext 数据对象
+     * @param business        当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
+
+        //处理 businessOwnerRoomRel 节点
+        if (data.containsKey("businessOwnerRoomRel")) {
+            Object bObj = data.get("businessOwnerRoomRel");
+            JSONArray businessOwnerRoomRels = null;
+            if (bObj instanceof JSONObject) {
+                businessOwnerRoomRels = new JSONArray();
+                businessOwnerRoomRels.add(bObj);
+            } else {
+                businessOwnerRoomRels = (JSONArray) bObj;
+            }
+            //JSONObject businessOwnerRoomRel = data.getJSONObject("businessOwnerRoomRel");
+            for (int bOwnerRoomRelIndex = 0; bOwnerRoomRelIndex < businessOwnerRoomRels.size(); bOwnerRoomRelIndex++) {
+                JSONObject businessOwnerRoomRel = businessOwnerRoomRels.getJSONObject(bOwnerRoomRelIndex);
+                doBusinessOwnerRoomRel(business, businessOwnerRoomRel);
+                if (bObj instanceof JSONObject) {
+                    dataFlowContext.addParamOut("rel_id", businessOwnerRoomRel.getString("rel_id"));
+                }
+            }
+        }
+    }
+
+    /**
+     * business 数据转移到 instance
+     *
+     * @param dataFlowContext 数据对象
+     * @param business        当前业务对象
+     */
+    @Override
+    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+
+        Map info = new HashMap();
+        info.put("bId", business.getbId());
+        info.put("operate", StatusConstant.OPERATE_ADD);
+
+        //业主房屋信息
+        List<Map> businessOwnerRoomRelInfo = ownerRoomRelServiceDaoImpl.getBusinessOwnerRoomRelInfo(info);
+        if (businessOwnerRoomRelInfo != null && businessOwnerRoomRelInfo.size() > 0) {
+            // reFresh(info, businessOwnerRoomRelInfo.get(0));
+            ownerRoomRelServiceDaoImpl.saveOwnerRoomRelInfoInstance(info);
+            if (businessOwnerRoomRelInfo.size() == 1) {
+                dataFlowContext.addParamOut("relId", businessOwnerRoomRelInfo.get(0).get("rel_id"));
+            }
+        }
+    }
+
+
+    /**
+     * 刷 分片字段
+     *
+     * @param info         查询对象
+     * @param businessInfo 小区ID
+     */
+    private void reFreshShareColumn(Map info, Map businessInfo) {
+
+        if (info.containsKey("ownerId")) {
+            return;
+        }
+
+        if (!businessInfo.containsKey("owner_id")) {
+            return;
+        }
+
+        info.put("ownerId", businessInfo.get("owner_id"));
+    }
+
+    /**
+     * 撤单
+     *
+     * @param dataFlowContext 数据对象
+     * @param business        当前业务对象
+     */
+    @Override
+    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
+        String bId = business.getbId();
+        //Assert.hasLength(bId,"请求报文中没有包含 bId");
+        Map info = new HashMap();
+        info.put("bId", bId);
+        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
+        Map paramIn = new HashMap();
+        paramIn.put("bId", bId);
+        paramIn.put("statusCd", StatusConstant.STATUS_CD_INVALID);
+        //业主房屋信息
+        List<Map> ownerRoomRelInfo = ownerRoomRelServiceDaoImpl.getOwnerRoomRelInfo(info);
+        if (ownerRoomRelInfo != null && ownerRoomRelInfo.size() > 0) {
+            reFreshShareColumn(paramIn, ownerRoomRelInfo.get(0));
+            ownerRoomRelServiceDaoImpl.updateOwnerRoomRelInfoInstance(paramIn);
+        }
+    }
+
+
+    /**
+     * 处理 businessOwnerRoomRel 节点
+     *
+     * @param business             总的数据节点
+     * @param businessOwnerRoomRel 业主房屋节点
+     */
+    private void doBusinessOwnerRoomRel(Business business, JSONObject businessOwnerRoomRel) {
+
+        Assert.jsonObjectHaveKey(businessOwnerRoomRel, "relId", "businessOwnerRoomRel 节点下没有包含 relId 节点");
+
+        if (businessOwnerRoomRel.getString("relId").startsWith("-")) {
+            //刷新缓存
+            //flushOwnerRoomRelId(business.getDatas());
+
+            businessOwnerRoomRel.put("relId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerRoomRelId));
+
+        }
+
+        businessOwnerRoomRel.put("bId", business.getbId());
+        businessOwnerRoomRel.put("operate", StatusConstant.OPERATE_ADD);
+        //保存业主房屋信息
+        ownerRoomRelServiceDaoImpl.saveBusinessOwnerRoomRelInfo(businessOwnerRoomRel);
+
+    }
+
+    public IOwnerRoomRelServiceDao getOwnerRoomRelServiceDaoImpl() {
+        return ownerRoomRelServiceDaoImpl;
+    }
+
+    public void setOwnerRoomRelServiceDaoImpl(IOwnerRoomRelServiceDao ownerRoomRelServiceDaoImpl) {
+        this.ownerRoomRelServiceDaoImpl = ownerRoomRelServiceDaoImpl;
+    }
+}

+ 190 - 0
UserService/src/main/java/com/java110/user/listener/ownerRoomRel/UpdateOwnerRoomRelInfoListener.java

@@ -0,0 +1,190 @@
+package com.java110.user.listener.ownerRoomRel;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.BusinessTypeConstant;
+import com.java110.common.constant.ResponseConstant;
+import com.java110.common.constant.StatusConstant;
+import com.java110.common.exception.ListenerExecuteException;
+import com.java110.common.util.Assert;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.Business;
+import com.java110.user.dao.IOwnerRoomRelServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 修改业主房屋信息 侦听
+ * <p>
+ * 处理节点
+ * 1、businessOwnerRoomRel:{} 业主房屋基本信息节点
+ * 2、businessOwnerRoomRelAttr:[{}] 业主房屋属性信息节点
+ * 3、businessOwnerRoomRelPhoto:[{}] 业主房屋照片信息节点
+ * 4、businessOwnerRoomRelCerdentials:[{}] 业主房屋证件信息节点
+ * 协议地址 :https://github.com/java110/MicroCommunity/wiki/%E4%BF%AE%E6%94%B9%E5%95%86%E6%88%B7%E4%BF%A1%E6%81%AF-%E5%8D%8F%E8%AE%AE
+ * Created by wuxw on 2018/5/18.
+ */
+@Java110Listener("updateOwnerRoomRelInfoListener")
+@Transactional
+public class UpdateOwnerRoomRelInfoListener extends AbstractOwnerRoomRelBusinessServiceDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(UpdateOwnerRoomRelInfoListener.class);
+    @Autowired
+    private IOwnerRoomRelServiceDao ownerRoomRelServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 2;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_ROOM_REL;
+    }
+
+    /**
+     * business过程
+     *
+     * @param dataFlowContext 上下文对象
+     * @param business        业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
+
+        //处理 businessOwnerRoomRel 节点
+        if (data.containsKey("businessOwnerRoomRel")) {
+            //处理 businessOwnerRoomRel 节点
+            if (data.containsKey("businessOwnerRoomRel")) {
+                Object _obj = data.get("businessOwnerRoomRel");
+                JSONArray businessOwnerRoomRels = null;
+                if (_obj instanceof JSONObject) {
+                    businessOwnerRoomRels = new JSONArray();
+                    businessOwnerRoomRels.add(_obj);
+                } else {
+                    businessOwnerRoomRels = (JSONArray) _obj;
+                }
+                //JSONObject businessOwnerRoomRel = data.getJSONObject("businessOwnerRoomRel");
+                for (int _ownerRoomRelIndex = 0; _ownerRoomRelIndex < businessOwnerRoomRels.size(); _ownerRoomRelIndex++) {
+                    JSONObject businessOwnerRoomRel = businessOwnerRoomRels.getJSONObject(_ownerRoomRelIndex);
+                    doBusinessOwnerRoomRel(business, businessOwnerRoomRel);
+                    if (_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("relId", businessOwnerRoomRel.getString("relId"));
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
+     * business to instance 过程
+     *
+     * @param dataFlowContext 数据对象
+     * @param business        当前业务对象
+     */
+    @Override
+    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
+
+        JSONObject data = business.getDatas();
+
+        Map info = new HashMap();
+        info.put("bId", business.getbId());
+        info.put("operate", StatusConstant.OPERATE_ADD);
+
+        //业主房屋信息
+        List<Map> businessOwnerRoomRelInfos = ownerRoomRelServiceDaoImpl.getBusinessOwnerRoomRelInfo(info);
+        if (businessOwnerRoomRelInfos != null && businessOwnerRoomRelInfos.size() > 0) {
+            for (int _ownerRoomRelIndex = 0; _ownerRoomRelIndex < businessOwnerRoomRelInfos.size(); _ownerRoomRelIndex++) {
+                Map businessOwnerRoomRelInfo = businessOwnerRoomRelInfos.get(_ownerRoomRelIndex);
+                flushBusinessOwnerRoomRelInfo(businessOwnerRoomRelInfo, StatusConstant.STATUS_CD_VALID);
+                ownerRoomRelServiceDaoImpl.updateOwnerRoomRelInfoInstance(businessOwnerRoomRelInfo);
+                if (businessOwnerRoomRelInfo.size() == 1) {
+                    dataFlowContext.addParamOut("relId", businessOwnerRoomRelInfo.get("rel_id"));
+                }
+            }
+        }
+
+    }
+
+    /**
+     * 撤单
+     *
+     * @param dataFlowContext 数据对象
+     * @param business        当前业务对象
+     */
+    @Override
+    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
+
+        String bId = business.getbId();
+        //Assert.hasLength(bId,"请求报文中没有包含 bId");
+        Map info = new HashMap();
+        info.put("bId", bId);
+        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
+        Map delInfo = new HashMap();
+        delInfo.put("bId", business.getbId());
+        delInfo.put("operate", StatusConstant.OPERATE_DEL);
+        //业主房屋信息
+        List<Map> ownerRoomRelInfo = ownerRoomRelServiceDaoImpl.getOwnerRoomRelInfo(info);
+        if (ownerRoomRelInfo != null && ownerRoomRelInfo.size() > 0) {
+
+            //业主房屋信息
+            List<Map> businessOwnerRoomRelInfos = ownerRoomRelServiceDaoImpl.getBusinessOwnerRoomRelInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if (businessOwnerRoomRelInfos == null || businessOwnerRoomRelInfos.size() == 0) {
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败(ownerRoomRel),程序内部异常,请检查! " + delInfo);
+            }
+            for (int _ownerRoomRelIndex = 0; _ownerRoomRelIndex < businessOwnerRoomRelInfos.size(); _ownerRoomRelIndex++) {
+                Map businessOwnerRoomRelInfo = businessOwnerRoomRelInfos.get(_ownerRoomRelIndex);
+                flushBusinessOwnerRoomRelInfo(businessOwnerRoomRelInfo, StatusConstant.STATUS_CD_VALID);
+                ownerRoomRelServiceDaoImpl.updateOwnerRoomRelInfoInstance(businessOwnerRoomRelInfo);
+            }
+        }
+
+    }
+
+
+    /**
+     * 处理 businessOwnerRoomRel 节点
+     *
+     * @param business             总的数据节点
+     * @param businessOwnerRoomRel 业主房屋节点
+     */
+    private void doBusinessOwnerRoomRel(Business business, JSONObject businessOwnerRoomRel) {
+
+        Assert.jsonObjectHaveKey(businessOwnerRoomRel, "relId", "businessOwnerRoomRel 节点下没有包含 relId 节点");
+
+        if (businessOwnerRoomRel.getString("relId").startsWith("-")) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "ownerRoomRelId 错误,不能自动生成(必须已经存在的relId)" + businessOwnerRoomRel);
+        }
+        //自动保存DEL
+        autoSaveDelBusinessOwnerRoomRel(business, businessOwnerRoomRel);
+
+        businessOwnerRoomRel.put("bId", business.getbId());
+        businessOwnerRoomRel.put("operate", StatusConstant.OPERATE_ADD);
+        //保存业主房屋信息
+        ownerRoomRelServiceDaoImpl.saveBusinessOwnerRoomRelInfo(businessOwnerRoomRel);
+
+    }
+
+
+    public IOwnerRoomRelServiceDao getOwnerRoomRelServiceDaoImpl() {
+        return ownerRoomRelServiceDaoImpl;
+    }
+
+    public void setOwnerRoomRelServiceDaoImpl(IOwnerRoomRelServiceDao ownerRoomRelServiceDaoImpl) {
+        this.ownerRoomRelServiceDaoImpl = ownerRoomRelServiceDaoImpl;
+    }
+
+
+}

+ 112 - 0
UserService/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java

@@ -0,0 +1,112 @@
+package com.java110.user.smo.impl;
+
+
+import com.java110.common.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.smo.owner.IOwnerRoomRelInnerServiceSMO;
+import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.dto.OwnerRoomRelDto;
+import com.java110.dto.PageDto;
+import com.java110.dto.UserDto;
+import com.java110.user.dao.IOwnerRoomRelServiceDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description 业主房屋内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class OwnerRoomRelInnerServiceSMOImpl extends BaseServiceSMO implements IOwnerRoomRelInnerServiceSMO {
+
+    @Autowired
+    private IOwnerRoomRelServiceDao ownerRoomRelServiceDaoImpl;
+
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+    @Override
+    public List<OwnerRoomRelDto> queryOwnerRoomRels(@RequestBody  OwnerRoomRelDto ownerRoomRelDto) {
+
+        //校验是否传了 分页信息
+
+        int page = ownerRoomRelDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            ownerRoomRelDto.setPage((page - 1) * ownerRoomRelDto.getRow());
+            ownerRoomRelDto.setRow(page * ownerRoomRelDto.getRow());
+        }
+
+        List<OwnerRoomRelDto> ownerRoomRels = BeanConvertUtil.covertBeanList(ownerRoomRelServiceDaoImpl.getOwnerRoomRelInfo(BeanConvertUtil.beanCovertMap(ownerRoomRelDto)), OwnerRoomRelDto.class);
+
+        if (ownerRoomRels == null || ownerRoomRels.size() == 0) {
+            return ownerRoomRels;
+        }
+
+        String[] userIds = getUserIds(ownerRoomRels);
+        //根据 userId 查询用户信息
+        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+
+        for (OwnerRoomRelDto ownerRoomRel : ownerRoomRels) {
+            refreshOwnerRoomRel(ownerRoomRel, users);
+        }
+        return ownerRoomRels;
+    }
+
+    /**
+     * 从用户列表中查询用户,将用户中的信息 刷新到 floor对象中
+     *
+     * @param ownerRoomRel 小区业主房屋信息
+     * @param users 用户列表
+     */
+    private void refreshOwnerRoomRel(OwnerRoomRelDto ownerRoomRel, List<UserDto> users) {
+        for (UserDto user : users) {
+            if (ownerRoomRel.getUserId().equals(user.getUserId())) {
+                BeanConvertUtil.covertBean(user, ownerRoomRel);
+            }
+        }
+    }
+
+    /**
+     * 获取批量userId
+     *
+     * @param ownerRoomRels 小区楼信息
+     * @return 批量userIds 信息
+     */
+    private String[] getUserIds(List<OwnerRoomRelDto> ownerRoomRels) {
+        List<String> userIds = new ArrayList<String>();
+        for (OwnerRoomRelDto ownerRoomRel : ownerRoomRels) {
+            userIds.add(ownerRoomRel.getUserId());
+        }
+
+        return userIds.toArray(new String[userIds.size()]);
+    }
+
+    @Override
+    public int queryOwnerRoomRelsCount(@RequestBody OwnerRoomRelDto ownerRoomRelDto) {
+        return ownerRoomRelServiceDaoImpl.queryOwnerRoomRelsCount(BeanConvertUtil.beanCovertMap(ownerRoomRelDto));    }
+
+    public IOwnerRoomRelServiceDao getOwnerRoomRelServiceDaoImpl() {
+        return ownerRoomRelServiceDaoImpl;
+    }
+
+    public void setOwnerRoomRelServiceDaoImpl(IOwnerRoomRelServiceDao ownerRoomRelServiceDaoImpl) {
+        this.ownerRoomRelServiceDaoImpl = ownerRoomRelServiceDaoImpl;
+    }
+
+    public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
+        return userInnerServiceSMOImpl;
+    }
+
+    public void setUserInnerServiceSMOImpl(IUserInnerServiceSMO userInnerServiceSMOImpl) {
+        this.userInnerServiceSMOImpl = userInnerServiceSMOImpl;
+    }
+}

+ 6 - 0
docs/_sidebar.md

@@ -31,6 +31,9 @@
   * [保存房屋信息](api/room/saveRoom.md)
   * [修改房屋信息](api/room/updateRoom.md)
   * [删除房屋信息](api/room/deleteRoom.md)
+  * [添加业主](api/owner/saveOwner.md)
+  * [修改业主](api/owner/updateOwner.md)
+  * [删除业主](api/owner/deleteOwner.md)
 
 * 服务端接口协议
 
@@ -61,6 +64,9 @@
   * [保存业主](services/owner/SaveOwnerInfo.md)
   * [修改业主](services/owner/UpdateOwnerInfo.md)
   * [删除业主](services/owner/DeleteOwnerInfo.md)
+  * [房屋售卖](services/owner/SaveOwnerRoomRelInfo.md)
+  * [修改业主](services/owner/UpdateOwnerRoomRelInfo.md)
+  * [删除业主](services/owner/DeleteOwnerRoomRelInfo.md)
 
 * 工具类接口
 

+ 7 - 10
docs/api/owner/deleteUnit.md

@@ -1,11 +1,11 @@
 
 
-**1\. 删除小区单元信息**
+**1\. 删除业主信息**
 ###### 接口功能
-> 用户通过web端或APP删除单元信息接口
+> 用户通过web端或APP删除业主信息接口
 
 ###### URL
-> [http://api.java110.com:8008/api/unit.deleteUnit](http://api.java110.com:8008/api/unit.deleteUnit)
+> [http://api.java110.com:8008/api/owner.deleteOwner](http://api.java110.com:8008/api/owner.deleteOwner)
 
 ###### 支持格式
 > JSON
@@ -24,9 +24,7 @@
 ###### 请求参数
 |参数名称|约束|类型|长度|描述|取值说明|
 | :-: | :-: | :-: | :-: | :-: | :-: |
-|floorId|1|String|30|小区楼ID|-|
-|communityId|1|String|30|小区ID|-|
-|unitId|1|String|30|单元ID|-|
+|memberId|1|String|30|业主ID|-|
 
 ###### 返回协议
 
@@ -38,7 +36,7 @@
 
 
 ###### 举例
-> 地址:[http://api.java110.com:8008/api/unit.deleteUnit](http://api.java110.com:8008/api/unit.deleteUnit)
+> 地址:[http://api.java110.com:8008/api/owner.deleteOwner](http://api.java110.com:8008/api/owner.deleteOwner)
 
 ``` javascript
 请求头信息:
@@ -51,9 +49,8 @@ SIGN:aabdncdhdbd878sbdudn898
 请求报文:
 
 {
-    "floorId":"填写具体值",
-     "communityId":"填写具体值",
-     "unitId":"填写具体值",
+    "memberId":"填写具体值",
+    "ownerTypeCd":"1001"
 }
 
 返回报文:

+ 9 - 7
docs/api/owner/saveOwner.md

@@ -5,7 +5,7 @@
 > 用户通过web端或APP保存单元信息接口
 
 ###### URL
-> [http://api.java110.com:8008/api/unit.saveUnit](http://api.java110.com:8008/api/unit.saveUnit)
+> [http://api.java110.com:8008/api/owner.saveOwner](http://api.java110.com:8008/api/owner.saveOwner)
 
 ###### 支持格式
 > JSON
@@ -45,7 +45,7 @@
 
 
 ###### 举例
-> 地址:[http://api.java110.com:8008/api/unit.saveUnit](http://api.java110.com:8008/api/unit.saveUnit)
+> 地址:[http://api.java110.com:8008/api/owner.saveOwner](http://api.java110.com:8008/api/owner.saveOwner)
 
 ``` javascript
 请求头信息:
@@ -58,11 +58,13 @@ SIGN:aabdncdhdbd878sbdudn898
 请求报文:
 
 {
-    "floorId":"填写具体值",
-     "layerCount":"填写具体值",
-     "unitNum":"填写具体值",
-     "lift":"填写具体值",
-     "remark":"填写具体值"
+    "sex":"填写具体值",
+            "name":"填写具体值",
+            "link":"填写具体值",
+            "remark":"填写具体值",
+            "userId":"填写具体值",
+            "ownerTypeCd":"1001",
+            "age":"填写具体值"
 }
 
 返回报文:

+ 22 - 18
docs/api/owner/updateUnit.md

@@ -1,11 +1,11 @@
 
 
-**1\. 修改小区单元信息**
+**1\. 修改业主信息**
 ###### 接口功能
-> 用户通过web端或APP修改单元信息接口
+> 用户通过web端或APP修改业主信息接口
 
 ###### URL
-> [http://api.java110.com:8008/api/unit.updateUnit](http://api.java110.com:8008/api/unit.updateUnit)
+> [http://api.java110.com:8008/api/owner.updateOwner](http://api.java110.com:8008/api/owner.updateOwner)
 
 ###### 支持格式
 > JSON
@@ -24,14 +24,15 @@
 ###### 请求参数
 |参数名称|约束|类型|长度|描述|取值说明|
 | :-: | :-: | :-: | :-: | :-: | :-: |
-|floorId|1|String|30|小区楼ID|-|
-|communityId|1|String|30|小区ID|-|
-|unitId|1|String|30|单元ID|-|
-|unitNum|1|String|12|单元编号|-|
-|layerCount|1|int|-|楼总层数|-|
-|lift|1|String|4|是否有楼梯|1010 有 2020 无|
-|layerCount|1|int|-|楼总层数|-|
-|remark|?|string|200|备注|-|
+|sex|1|String|30|-|-|
+|name|1|String|30|-|-|
+|link|1|String|30|-|-|
+|remark|1|String|30|-|-|
+|ownerId|1|String|30|-|-|
+|userId|1|String|30|-|-|
+|ownerTypeCd|1|String|4|业主类型|1001 业主 1002 家庭成员|
+|age|1|String|30|-|-|
+|memberId|1|String|30|-|-|
 
 ###### 返回协议
 
@@ -43,7 +44,7 @@
 
 
 ###### 举例
-> 地址:[http://api.java110.com:8008/api/unit.updateUnit](http://api.java110.com:8008/api/unit.updateUnit)
+> 地址:[http://api.java110.com:8008/api/owner.updateOwner](http://api.java110.com:8008/api/owner.updateOwner)
 
 ``` javascript
 请求头信息:
@@ -56,12 +57,15 @@ SIGN:aabdncdhdbd878sbdudn898
 请求报文:
 
 {
-    "floorId":"填写具体值",
-     "layerCount":"填写具体值",
-     "unitId":"填写具体值",
-     "unitNum":"填写具体值",
-     "lift":"填写具体值",
-     "remark":"填写具体值"
+    "memberId":"12313",
+    "ownerId":"12313",
+    "sex":"填写具体值",
+    "name":"填写具体值",
+    "link":"填写具体值",
+    "remark":"填写具体值",
+     "ownerTypeCd":"1001",
+    "userId":"填写具体值",
+    "age":"填写具体值"
 }
 
 返回报文:

+ 114 - 0
docs/services/owner/DeleteOwnerRoomRelInfo.md

@@ -0,0 +1,114 @@
+
+
+**1\. 删除业主房屋**
+###### 接口功能
+> API服务做删除业主房屋时调用该接口
+
+###### URL
+> [http://user-service/ownerRoomRelApi/service](http://user-service/ownerRoomRelApi/service)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> POST
+
+###### 协议接口
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-:|
+|-|orders|1|Object|-|订单节点|-|
+|-|business|1|Array|-|业务节点|-|
+
+###### orders
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|orders|1|Object|-|订单节点|-|
+|orders|appId|1|String|10|系统ID|由中心服务提供|
+|orders|transactionId|1|String|30|交互流水|appId+'00'+YYYYMMDD+10位序列|
+|orders|userId|1|String|30|用户ID|已有用户ID|
+|orders|orderTypeCd|1|String|4|订单类型|查看订单类型说明|
+|orders|requestTime|1|String|14|请求时间|YYYYMMDDhhmmss|
+|orders|remark|1|String|200|备注|备注|
+|orders|sign|?|String|64|签名|查看加密说明|
+|orders|attrs|?|Array|-|订单属性|-|
+|attrs|specCd|1|String|12|规格编码|由中心服务提供|
+|attrs|value|1|String|50|属性值|-|
+|orders|response|1|Object|-|返回结果节点|-|
+|response|code|1|String|4|返回状态|查看状态说明|
+|response|message|1|String|200|返回状态描述|-|
+
+###### business
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|business|?|Array|-|业务节点|-|
+|business|businessTypeCd|1|String|12|业务类型编码|500100030002|
+|business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
+|datas|businessOwnerRoomRel|1|Object|-|小区成员|小区成员|
+|businessOwnerRoomRel|relId|1|String|30|-|-|
+
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功,body内容为返回内容,
+
+
+
+
+
+###### 举例
+> 地址:[http://user-service/ownerRoomRelApi/service](http://user-service/ownerRoomRelApi/service)
+
+``` javascript
+请求头信息:
+Content-Type:application/json
+
+请求报文:
+
+{
+  "orders": {
+    "appId": "外系统ID,分配得到",
+    "transactionId": "100000000020180409224736000001",
+    "userId": "用户ID",
+    "orderTypeCd": "订单类型,查询,受理",
+    "requestTime": "20180409224736",
+    "remark": "备注",
+    "sign": "这个服务是否要求MD5签名",
+    "businessType":"I",
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  },
+  "business": {
+    "businessTypeCd": "111100050001",
+    "bId":"1234567892",
+    "remark": "备注",
+    "datas": {
+      "businessOwnerRoomRel": {
+                "relId":"填写存在的值"
+      }
+    },
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  }
+}
+
+返回报文:
+ {
+	"orderTypeCd": "D",
+	"response": {
+		"code": "0000",
+		"message": "成功"
+	},
+	"responseTime": "20190418102004",
+	"bId": "202019041810750003",
+	"businessType": "B",
+	"transactionId": "3a5a411ec65a4c3f895935638aa1d2bc",
+	"dataFlowId": "44fde86d39ce46f4b4aab5f6b14f3947"
+}
+
+```

+ 123 - 0
docs/services/owner/SaveOwnerRoomRelInfo.md

@@ -0,0 +1,123 @@
+
+
+**1\. 保存业主房屋**
+###### 接口功能
+> API服务做保存业主房屋时调用该接口
+
+###### URL
+> [http://user-service/ownerRoomRelApi/service](http://user-service/ownerRoomRelApi/service)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> POST
+
+###### 协议接口
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-:|
+|-|orders|1|Object|-|订单节点|-|
+|-|business|1|Array|-|业务节点|-|
+
+###### orders
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|orders|1|Object|-|订单节点|-|
+|orders|appId|1|String|10|系统ID|由中心服务提供|
+|orders|transactionId|1|String|30|交互流水|appId+'00'+YYYYMMDD+10位序列|
+|orders|userId|1|String|30|用户ID|已有用户ID|
+|orders|orderTypeCd|1|String|4|订单类型|查看订单类型说明|
+|orders|requestTime|1|String|14|请求时间|YYYYMMDDhhmmss|
+|orders|remark|1|String|200|备注|备注|
+|orders|sign|?|String|64|签名|查看加密说明|
+|orders|attrs|?|Array|-|订单属性|-|
+|attrs|specCd|1|String|12|规格编码|由中心服务提供|
+|attrs|value|1|String|50|属性值|-|
+|orders|response|1|Object|-|返回结果节点|-|
+|response|code|1|String|4|返回状态|查看状态说明|
+|response|message|1|String|200|返回状态描述|-|
+
+###### business
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|business|?|Array|-|业务节点|-|
+|business|businessTypeCd|1|String|12|业务类型编码|500100030002|
+|business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
+|datas|businessOwnerRoomRel|1|Object|-|小区成员|小区成员|
+|businessOwnerRoomRel|relId|1|String|30|-|-|
+|businessOwnerRoomRel|remark|1|String|30|-|-|
+|businessOwnerRoomRel|state|1|String|30|-|-|
+|businessOwnerRoomRel|ownerId|1|String|30|-|-|
+|businessOwnerRoomRel|userId|1|String|30|-|-|
+|businessOwnerRoomRel|roomId|1|String|30|-|-|
+
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功,body内容为返回内容,
+
+
+
+
+
+###### 举例
+> 地址:[http://user-service/ownerRoomRelApi/service](http://user-service/ownerRoomRelApi/service)
+
+``` javascript
+请求头信息:
+Content-Type:application/json
+
+请求报文:
+
+{
+  "orders": {
+    "appId": "外系统ID,分配得到",
+    "transactionId": "100000000020180409224736000001",
+    "userId": "用户ID",
+    "orderTypeCd": "订单类型,查询,受理",
+    "requestTime": "20180409224736",
+    "remark": "备注",
+    "sign": "这个服务是否要求MD5签名",
+    "businessType":"I",
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  },
+  "business": {
+    "businessTypeCd": "111100030001",
+    "bId":"1234567892",
+    "remark": "备注",
+    "datas": {
+      "businessOwnerRoomRel": {
+        "remark":"填写具体值",
+        "state":"填写具体值",
+        "ownerId":"填写具体值",
+        "userId":"填写具体值",
+        "roomId":"填写具体值"
+      }
+    },
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  }
+}
+
+返回报文:
+ {
+	"orderTypeCd": "D",
+	"response": {
+		"code": "0000",
+		"message": "成功"
+	},
+	"responseTime": "20190418102004",
+	"bId": "202019041810750003",
+	"businessType": "B",
+	"transactionId": "3a5a411ec65a4c3f895935638aa1d2bc",
+	"dataFlowId": "44fde86d39ce46f4b4aab5f6b14f3947"
+}
+
+```

+ 124 - 0
docs/services/owner/UpdateOwnerRoomRelInfo.md

@@ -0,0 +1,124 @@
+
+
+**1\. 修改业主房屋**
+###### 接口功能
+> API服务做修改业主房屋时调用该接口
+
+###### URL
+> [http://user-service/ownerRoomRelApi/service](http://user-service/ownerRoomRelApi/service)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> POST
+
+###### 协议接口
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-:|
+|-|orders|1|Object|-|订单节点|-|
+|-|business|1|Array|-|业务节点|-|
+
+###### orders
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|orders|1|Object|-|订单节点|-|
+|orders|appId|1|String|10|系统ID|由中心服务提供|
+|orders|transactionId|1|String|30|交互流水|appId+'00'+YYYYMMDD+10位序列|
+|orders|userId|1|String|30|用户ID|已有用户ID|
+|orders|orderTypeCd|1|String|4|订单类型|查看订单类型说明|
+|orders|requestTime|1|String|14|请求时间|YYYYMMDDhhmmss|
+|orders|remark|1|String|200|备注|备注|
+|orders|sign|?|String|64|签名|查看加密说明|
+|orders|attrs|?|Array|-|订单属性|-|
+|attrs|specCd|1|String|12|规格编码|由中心服务提供|
+|attrs|value|1|String|50|属性值|-|
+|orders|response|1|Object|-|返回结果节点|-|
+|response|code|1|String|4|返回状态|查看状态说明|
+|response|message|1|String|200|返回状态描述|-|
+
+###### business
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|business|?|Array|-|业务节点|-|
+|business|businessTypeCd|1|String|12|业务类型编码|500100030002|
+|business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
+|datas|businessOwnerRoomRel|1|Object|-|小区成员|小区成员|
+|businessOwnerRoomRel|relId|1|String|30|-|-|
+|businessOwnerRoomRel|remark|1|String|30|-|-|
+|businessOwnerRoomRel|state|1|String|30|-|-|
+|businessOwnerRoomRel|ownerId|1|String|30|-|-|
+|businessOwnerRoomRel|userId|1|String|30|-|-|
+|businessOwnerRoomRel|roomId|1|String|30|-|-|
+
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功,body内容为返回内容,
+
+
+
+
+
+###### 举例
+> 地址:[http://user-service/ownerRoomRelApi/service](http://user-service/ownerRoomRelApi/service)
+
+``` javascript
+请求头信息:
+Content-Type:application/json
+
+请求报文:
+
+{
+  "orders": {
+    "appId": "外系统ID,分配得到",
+    "transactionId": "100000000020180409224736000001",
+    "userId": "用户ID",
+    "orderTypeCd": "订单类型,查询,受理",
+    "requestTime": "20180409224736",
+    "remark": "备注",
+    "sign": "这个服务是否要求MD5签名",
+    "businessType":"I",
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  },
+  "business": {
+    "businessTypeCd": "111100040001",
+    "bId":"1234567892",
+    "remark": "备注",
+    "datas": {
+      "businessOwnerRoomRel": {
+                "relId":"填写具体值",
+        "remark":"填写具体值",
+        "state":"填写具体值",
+        "ownerId":"填写具体值",
+        "userId":"填写具体值",
+        "roomId":"填写具体值"
+      }
+    },
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  }
+}
+
+返回报文:
+ {
+	"orderTypeCd": "D",
+	"response": {
+		"code": "0000",
+		"message": "成功"
+	},
+	"responseTime": "20190418102004",
+	"bId": "202019041810750003",
+	"businessType": "B",
+	"transactionId": "3a5a411ec65a4c3f895935638aa1d2bc",
+	"dataFlowId": "44fde86d39ce46f4b4aab5f6b14f3947"
+}
+
+```

+ 82 - 0
java110-bean/src/main/java/com/java110/dto/OwnerRoomRelDto.java

@@ -0,0 +1,82 @@
+package com.java110.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 业主房屋数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class OwnerRoomRelDto extends PageDto implements Serializable {
+
+    private String relId;
+private String remark;
+private String state;
+private String ownerId;
+private String userId;
+private String roomId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getRelId() {
+        return relId;
+    }
+public void setRelId(String relId) {
+        this.relId = relId;
+    }
+public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getState() {
+        return state;
+    }
+public void setState(String state) {
+        this.state = state;
+    }
+public String getOwnerId() {
+        return ownerId;
+    }
+public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
+public String getUserId() {
+        return userId;
+    }
+public void setUserId(String userId) {
+        this.userId = userId;
+    }
+public String getRoomId() {
+        return roomId;
+    }
+public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

+ 81 - 0
java110-code-generator/src/main/java/com/java110/OwnerRoomRelGeneratorApplication.java

@@ -0,0 +1,81 @@
+package com.java110;
+
+
+import com.java110.code.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Hello world!
+ */
+public class OwnerRoomRelGeneratorApplication {
+
+    protected OwnerRoomRelGeneratorApplication() {
+        // prevents calls from subclass
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * 代码生成器 入口方法
+     *
+     * @param args 参数
+     */
+    public static void main(String[] args) {
+        Data data = new Data();
+        data.setId("relId");
+        data.setName("ownerRoomRel");
+        data.setDesc("业主房屋");
+        data.setShareParam("ownerId");
+        data.setShareColumn("owner_id");
+        data.setNewBusinessTypeCd("BUSINESS_TYPE_SAVE_OWNER_ROOM_REL");
+        data.setUpdateBusinessTypeCd("BUSINESS_TYPE_UPDATE_OWNER_ROOM_REL");
+        data.setDeleteBusinessTypeCd("BUSINESS_TYPE_DELETE_OWNER_ROOM_REL");
+        data.setNewBusinessTypeCdValue("111100030001");
+        data.setUpdateBusinessTypeCdValue("111100040001");
+        data.setDeleteBusinessTypeCdValue("111100050001");
+        data.setBusinessTableName("business_building_owner_room_rel");
+        data.setTableName("building_owner_room_rel");
+        Map<String, String> param = new HashMap<String, String>();
+        param.put("relId", "rel_id");
+        param.put("ownerId", "owner_id");
+        param.put("bId", "b_id");
+        param.put("roomId", "room_id");
+        param.put("state", "state");
+        param.put("userId", "user_id");
+        param.put("statusCd", "status_cd");
+        param.put("remark", "remark");
+        param.put("operate", "operate");
+        data.setParams(param);
+        GeneratorSaveInfoListener generatorSaveInfoListener = new GeneratorSaveInfoListener();
+        generatorSaveInfoListener.generator(data);
+
+        GeneratorAbstractBussiness generatorAbstractBussiness = new GeneratorAbstractBussiness();
+        generatorAbstractBussiness.generator(data);
+
+        GeneratorIServiceDaoListener generatorIServiceDaoListener = new GeneratorIServiceDaoListener();
+        generatorIServiceDaoListener.generator(data);
+
+        GeneratorServiceDaoImplListener generatorServiceDaoImplListener = new GeneratorServiceDaoImplListener();
+        generatorServiceDaoImplListener.generator(data);
+
+        GeneratorServiceDaoImplMapperListener generatorServiceDaoImplMapperListener = null;
+        generatorServiceDaoImplMapperListener = new GeneratorServiceDaoImplMapperListener();
+        generatorServiceDaoImplMapperListener.generator(data);
+
+        GeneratorUpdateInfoListener generatorUpdateInfoListener = new GeneratorUpdateInfoListener();
+        generatorUpdateInfoListener.generator(data);
+
+        GeneratorDeleteInfoListener generatorDeleteInfoListener = new GeneratorDeleteInfoListener();
+        generatorDeleteInfoListener.generator(data);
+
+        GeneratorInnerServiceSMOImpl generatorInnerServiceSMOImpl = new GeneratorInnerServiceSMOImpl();
+        generatorInnerServiceSMOImpl.generator(data);
+
+        GeneratorDtoBean generatorDtoBean = new GeneratorDtoBean();
+        generatorDtoBean.generator(data);
+
+        GeneratorIInnerServiceSMO generatorIInnerServiceSMO = new GeneratorIInnerServiceSMO();
+        generatorIInnerServiceSMO.generator(data);
+    }
+}

+ 3 - 3
java110-code-generator/src/main/java/com/java110/code/GeneratorSaveInfoListener.java

@@ -15,12 +15,12 @@ public class GeneratorSaveInfoListener extends BaseGenerator {
     public void generator(Data data) {
         StringBuffer sb = readFile(this.getClass().getResource("/template/SaveListener.txt").getFile());
         String fileContext = sb.toString();
-        if(StringUtils.isEmpty(data.getShareParam())){
+        if (StringUtils.isEmpty(data.getShareParam())) {
             data.setShareParam(data.getId());
         }
 
-        if(StringUtils.isEmpty(data.getShareColumn())){
-           data.setShareColumn(data.getParams().get(data.getShareColumn()).toString());
+        if (StringUtils.isEmpty(data.getShareColumn())) {
+            data.setShareColumn(data.getParams().get(data.getShareColumn()).toString());
         }
         fileContext = fileContext.replace("store", toLowerCaseFirstOne(data.getName()))
                 .replace("Store", toUpperCaseFirstOne(data.getName()))

+ 18 - 0
java110-common/src/main/java/com/java110/common/constant/BusinessTypeConstant.java

@@ -74,6 +74,24 @@ public class BusinessTypeConstant {
     public static final String BUSINESS_TYPE_DELETE_OWNER_INFO = "110100050001";
 
 
+    /**
+     * 房屋购买
+     */
+    public static final String BUSINESS_TYPE_SAVE_OWNER_ROOM_REL = "111100030001";
+
+    /**
+     * 房屋状态变更
+     */
+    public static final String BUSINESS_TYPE_UPDATE_OWNER_ROOM_REL = "111100040001";
+
+
+    /**
+     * 房屋转售
+     */
+    public static final String BUSINESS_TYPE_DELETE_OWNER_ROOM_REL = "111100050001";
+
+
+
 
 
     /**

+ 1 - 0
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -79,6 +79,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_roomId = "75";
     public static final String CODE_PREFIX_roomAttrId = "76";
     public static final String CODE_PREFIX_ownerId = "77";
+    public static final String CODE_PREFIX_ownerRoomRelId = "78";
 
     /**
      * 只有在不调用服务生成ID时有用

+ 42 - 0
java110-core/src/main/java/com/java110/core/smo/owner/IOwnerRoomRelInnerServiceSMO.java

@@ -0,0 +1,42 @@
+package com.java110.core.smo.owner;
+
+import com.java110.core.feign.FeignConfiguration;
+import com.java110.dto.OwnerRoomRelDto;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IOwnerRoomRelInnerServiceSMO
+ * @Description 业主房屋接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/ownerRoomRelApi")
+public interface IOwnerRoomRelInnerServiceSMO {
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param ownerRoomRelDto 数据对象分享
+     * @return OwnerRoomRelDto 对象数据
+     */
+    @RequestMapping(value = "/queryOwnerRoomRels", method = RequestMethod.POST)
+    List<OwnerRoomRelDto> queryOwnerRoomRels(@RequestBody OwnerRoomRelDto ownerRoomRelDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param ownerRoomRelDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryOwnerRoomRelsCount", method = RequestMethod.POST)
+    int queryOwnerRoomRelsCount(@RequestBody OwnerRoomRelDto ownerRoomRelDto);
+}

+ 0 - 36
java110-db/db/CommunityService/create_owner.sql

@@ -1,37 +0,0 @@
-
-CREATE TABLE business_building_owner(
-  member_id VARCHAR(30) NOT NULL COMMENT '业主成员ID',
-  owner_id VARCHAR(30) NOT NULL COMMENT '业主ID',
-  b_id VARCHAR(30) NOT NULL COMMENT '业务Id',
-  name VARCHAR(12) NOT NULL COMMENT '业主名称',
-  sex int NOT NULL COMMENT '性别',
-  age int NOT NULL COMMENT '年龄',
-  link varchar(11) NOT NULL COMMENT '联系人手机号',
-  user_id VARCHAR(30) NOT NULL COMMENT '用户ID',
-  remark VARCHAR(200) NOT NULL COMMENT '备注',
-  create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  operate VARCHAR(4) NOT NULL COMMENT '数据状态,添加ADD,修改MOD 删除DEL'
-);
-
-
-CREATE INDEX idx_business_owner_id ON business_building_owner(member_id);
-CREATE INDEX idx_business_owner_b_id ON business_building_owner(b_id);
-
-
-CREATE TABLE building_owner(
-  member_id VARCHAR(30) NOT NULL COMMENT '业主成员ID',
-  owner_id VARCHAR(30) NOT NULL COMMENT '业主ID',
-  b_id VARCHAR(30) NOT NULL COMMENT '业务Id',
-  name VARCHAR(12) NOT NULL COMMENT '业主名称',
-  sex int NOT NULL COMMENT '性别',
-  age int NOT NULL COMMENT '年龄',
-  link varchar(11) NOT NULL COMMENT '联系人手机号',
-  user_id VARCHAR(30) NOT NULL COMMENT '用户ID',
-  remark VARCHAR(200) NOT NULL COMMENT '备注',
-  create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  status_cd VARCHAR(2) NOT NULL DEFAULT '0' COMMENT '数据状态,详细参考c_status表,0, 在用 1失效',
-  UNIQUE KEY (member_id)
-);
-CREATE INDEX idx_owner_b_id ON building_owner(b_id);
-CREATE UNIQUE INDEX idx_owner_id ON building_owner(member_id);

+ 70 - 0
java110-db/db/UserService/create_owner.sql

@@ -0,0 +1,70 @@
+
+-- 单元信息 building 楼宇管理
+CREATE TABLE business_building_owner(
+  member_id VARCHAR(30) NOT NULL COMMENT '业主成员ID',
+  owner_id VARCHAR(30) NOT NULL COMMENT '业主ID',
+  b_id VARCHAR(30) NOT NULL COMMENT '业务Id',
+  name VARCHAR(12) NOT NULL COMMENT '业主名称',
+  sex int NOT NULL COMMENT '性别',
+  age int NOT NULL COMMENT '年龄',
+  link varchar(11) NOT NULL COMMENT '联系人手机号',
+  user_id VARCHAR(30) NOT NULL COMMENT '用户ID',
+  remark VARCHAR(200) NOT NULL COMMENT '备注',
+  create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  operate VARCHAR(4) NOT NULL COMMENT '数据状态,添加ADD,修改MOD 删除DEL'
+);
+
+
+CREATE INDEX idx_business_owner_id ON business_building_owner(member_id);
+CREATE INDEX idx_business_owner_b_id ON business_building_owner(b_id);
+
+
+CREATE TABLE building_owner(
+  member_id VARCHAR(30) NOT NULL COMMENT '业主成员ID',
+  owner_id VARCHAR(30) NOT NULL COMMENT '业主ID',
+  b_id VARCHAR(30) NOT NULL COMMENT '业务Id',
+  name VARCHAR(12) NOT NULL COMMENT '业主名称',
+  sex int NOT NULL COMMENT '性别',
+  age int NOT NULL COMMENT '年龄',
+  link varchar(11) NOT NULL COMMENT '联系人手机号',
+  user_id VARCHAR(30) NOT NULL COMMENT '用户ID',
+  remark VARCHAR(200) NOT NULL COMMENT '备注',
+  create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  status_cd VARCHAR(2) NOT NULL DEFAULT '0' COMMENT '数据状态,详细参考c_status表,0, 在用 1失效',
+  UNIQUE KEY (member_id)
+);
+CREATE INDEX idx_owner_b_id ON building_owner(b_id);
+CREATE UNIQUE INDEX idx_owner_id ON building_owner(member_id);
+
+-- 单元信息 building 楼宇管理
+CREATE TABLE business_building_owner_room_rel(
+  rel_id VARCHAR(30) NOT NULL COMMENT '关系ID',
+  owner_id VARCHAR(30) NOT NULL COMMENT '业主ID',
+  room_id VARCHAR(30) NOT NULL COMMENT '房间ID',
+  b_id VARCHAR(30) NOT NULL COMMENT '业务Id',
+  state varchar(4) NOT NULL COMMENT '业务状态  2001 业主未迁入 2002 业主迁入 2003 业主迁出',
+  user_id VARCHAR(30) NOT NULL COMMENT '用户ID',
+  remark VARCHAR(200) NOT NULL COMMENT '备注',
+  create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  operate VARCHAR(4) NOT NULL COMMENT '数据状态,添加ADD,修改MOD 删除DEL'
+);
+
+
+CREATE INDEX idx_bborrl_owner_id ON business_building_owner_room_rel(rel_id);
+CREATE INDEX idx_bborrl_b_id ON business_building_owner_room_rel(b_id);
+
+
+CREATE TABLE building_owner_room_rel(
+  rel_id VARCHAR(30) NOT NULL COMMENT '关系ID',
+  owner_id VARCHAR(30) NOT NULL COMMENT '业主ID',
+  room_id VARCHAR(30) NOT NULL COMMENT '房间ID',
+  b_id VARCHAR(30) NOT NULL COMMENT '业务Id',
+  state varchar(4) NOT NULL COMMENT '业务状态 2001 业主未迁入 2002 业主迁入 2003 业主迁出',
+  user_id VARCHAR(30) NOT NULL COMMENT '用户ID',
+  remark VARCHAR(200) NOT NULL COMMENT '备注',
+  create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  status_cd VARCHAR(2) NOT NULL DEFAULT '0' COMMENT '数据状态,详细参考c_status表,0, 在用 1失效',
+  UNIQUE KEY (rel_id)
+);
+CREATE INDEX idx_borr_b_id ON building_owner_room_rel(b_id);
+CREATE UNIQUE INDEX idx_borr_rel_id ON building_owner_room_rel(rel_id);

+ 186 - 0
java110-db/src/main/resources/mapper/owner/OwnerRoomRelServiceDaoImplMapper.xml

@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="ownerRoomRelServiceDaoImpl">
+
+    <!-- 保存业主房屋信息 add by wuxw 2018-07-03 -->
+       <insert id="saveBusinessOwnerRoomRelInfo" parameterType="Map">
+           insert into business_building_owner_room_rel(
+rel_id,operate,remark,state,owner_id,b_id,user_id,room_id
+) values (
+#{relId},#{operate},#{remark},#{state},#{ownerId},#{bId},#{userId},#{roomId}
+)
+       </insert>
+
+
+       <!-- 查询业主房屋信息(Business) add by wuxw 2018-07-03 -->
+       <select id="getBusinessOwnerRoomRelInfo" parameterType="Map" resultType="Map">
+           select  t.rel_id,t.rel_id relId,t.operate,t.remark,t.state,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.room_id,t.room_id roomId 
+from business_building_owner_room_rel t 
+where 1 =1 
+<if test="relId !=null and relId != ''">
+   and t.rel_id= #{relId}
+</if> 
+<if test="operate !=null and operate != ''">
+   and t.operate= #{operate}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="state !=null and state != ''">
+   and t.state= #{state}
+</if> 
+<if test="ownerId !=null and ownerId != ''">
+   and t.owner_id= #{ownerId}
+</if> 
+<if test="bId !=null and bId != ''">
+   and t.b_id= #{bId}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+   and t.room_id= #{roomId}
+</if> 
+
+       </select>
+
+
+
+
+
+    <!-- 保存业主房屋信息至 instance表中 add by wuxw 2018-07-03 -->
+    <insert id="saveOwnerRoomRelInfoInstance" parameterType="Map">
+        insert into building_owner_room_rel(
+rel_id,status_cd,remark,state,owner_id,b_id,user_id,room_id
+) select t.rel_id,'0',t.remark,t.state,t.owner_id,t.b_id,t.user_id,t.room_id from business_building_owner_room_rel t where 1=1
+<if test="relId !=null and relId != ''">
+   and t.rel_id= #{relId}
+</if> 
+   and t.operate= 'ADD'
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="state !=null and state != ''">
+   and t.state= #{state}
+</if> 
+<if test="ownerId !=null and ownerId != ''">
+   and t.owner_id= #{ownerId}
+</if> 
+<if test="bId !=null and bId != ''">
+   and t.b_id= #{bId}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+   and t.room_id= #{roomId}
+</if> 
+
+    </insert>
+
+
+
+    <!-- 查询业主房屋信息 add by wuxw 2018-07-03 -->
+    <select id="getOwnerRoomRelInfo" parameterType="Map" resultType="Map">
+        select  t.rel_id,t.rel_id relId,t.status_cd,t.status_cd statusCd,t.remark,t.state,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.room_id,t.room_id roomId 
+from building_owner_room_rel t 
+where 1 =1 
+<if test="relId !=null and relId != ''">
+   and t.rel_id= #{relId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="state !=null and state != ''">
+   and t.state= #{state}
+</if> 
+<if test="ownerId !=null and ownerId != ''">
+   and t.owner_id= #{ownerId}
+</if> 
+<if test="bId !=null and bId != ''">
+   and t.b_id= #{bId}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+   and t.room_id= #{roomId}
+</if> 
+<if test="page != -1 and page != null ">
+   limit #{page}, #{row}
+</if> 
+
+    </select>
+
+
+
+
+    <!-- 修改业主房屋信息 add by wuxw 2018-07-03 -->
+    <update id="updateOwnerRoomRelInfoInstance" parameterType="Map">
+        update  building_owner_room_rel t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="remark !=null and remark != ''">
+, t.remark= #{remark}
+</if> 
+<if test="state !=null and state != ''">
+, t.state= #{state}
+</if> 
+<if test="ownerId !=null and ownerId != ''">
+, t.owner_id= #{ownerId}
+</if> 
+<if test="userId !=null and userId != ''">
+, t.user_id= #{userId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+, t.room_id= #{roomId}
+</if> 
+ where 1=1 <if test="relId !=null and relId != ''">
+and t.rel_id= #{relId}
+</if> 
+<if test="bId !=null and bId != ''">
+and t.b_id= #{bId}
+</if> 
+
+    </update>
+
+    <!-- 查询业主房屋数量 add by wuxw 2018-07-03 -->
+     <select id="queryOwnerRoomRelsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from building_owner_room_rel t 
+where 1 =1 
+<if test="relId !=null and relId != ''">
+   and t.rel_id= #{relId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="state !=null and state != ''">
+   and t.state= #{state}
+</if> 
+<if test="ownerId !=null and ownerId != ''">
+   and t.owner_id= #{ownerId}
+</if> 
+<if test="bId !=null and bId != ''">
+   and t.b_id= #{bId}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+   and t.room_id= #{roomId}
+</if> 
+
+
+     </select>
+
+</mapper>