吴学文
2019-05-10 b82d10d935194ac94eed5bafd8a4b952ca5a2ea3
加入业主管理模块
7 文件已重命名
6个文件已修改
94 ■■■■ 已修改文件
UserService/src/main/java/com/java110/user/dao/IOwnerServiceDao.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserService/src/main/java/com/java110/user/dao/impl/OwnerServiceDaoImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserService/src/main/java/com/java110/user/listener/owner/AbstractOwnerBusinessServiceDataFlowListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserService/src/main/java/com/java110/user/listener/owner/DeleteOwnerInfoListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserService/src/main/java/com/java110/user/listener/owner/SaveOwnerInfoListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserService/src/main/java/com/java110/user/listener/owner/UpdateOwnerInfoListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/services/owner/DeleteOwnerInfo.md 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/services/owner/SaveOwnerInfo.md 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/services/owner/UpdateOwnerInfo.md 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/start/vedio.md 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-common/src/main/java/com/java110/common/constant/BusinessTypeConstant.java 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-core/src/main/java/com/java110/core/smo/owner/IOwnerInnerServiceSMO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserService/src/main/java/com/java110/user/dao/IOwnerServiceDao.java
File was renamed from CommunityService/src/main/java/com/java110/community/dao/IOwnerServiceDao.java
@@ -1,12 +1,7 @@
package com.java110.community.dao;
package com.java110.user.dao;
import com.java110.common.exception.DAOException;
import com.java110.entity.merchant.BoMerchant;
import com.java110.entity.merchant.BoMerchantAttr;
import com.java110.entity.merchant.Merchant;
import com.java110.entity.merchant.MerchantAttr;
import java.util.List;
import java.util.Map;
UserService/src/main/java/com/java110/user/dao/impl/OwnerServiceDaoImpl.java
File was renamed from CommunityService/src/main/java/com/java110/community/dao/impl/OwnerServiceDaoImpl.java
@@ -1,11 +1,11 @@
package com.java110.community.dao.impl;
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.community.dao.IOwnerServiceDao;
import com.java110.core.base.dao.BaseServiceDao;
import com.java110.user.dao.IOwnerServiceDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
UserService/src/main/java/com/java110/user/listener/owner/AbstractOwnerBusinessServiceDataFlowListener.java
File was renamed from CommunityService/src/main/java/com/java110/community/listener/owner/AbstractOwnerBusinessServiceDataFlowListener.java
@@ -1,12 +1,12 @@
package com.java110.community.listener.owner;
package com.java110.user.listener.owner;
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.community.dao.IOwnerServiceDao;
import com.java110.entity.center.Business;
import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
import com.java110.user.dao.IOwnerServiceDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
UserService/src/main/java/com/java110/user/listener/owner/DeleteOwnerInfoListener.java
File was renamed from CommunityService/src/main/java/com/java110/community/listener/owner/DeleteOwnerInfoListener.java
@@ -1,4 +1,4 @@
package com.java110.community.listener.owner;
package com.java110.user.listener.owner;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -7,10 +7,10 @@
import com.java110.common.constant.StatusConstant;
import com.java110.common.exception.ListenerExecuteException;
import com.java110.common.util.Assert;
import com.java110.community.dao.IOwnerServiceDao;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.entity.center.Business;
import com.java110.user.dao.IOwnerServiceDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
UserService/src/main/java/com/java110/user/listener/owner/SaveOwnerInfoListener.java
File was renamed from CommunityService/src/main/java/com/java110/community/listener/owner/SaveOwnerInfoListener.java
@@ -1,15 +1,15 @@
package com.java110.community.listener.owner;
package com.java110.user.listener.owner;
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.community.dao.IOwnerServiceDao;
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.IOwnerServiceDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
UserService/src/main/java/com/java110/user/listener/owner/UpdateOwnerInfoListener.java
File was renamed from CommunityService/src/main/java/com/java110/community/listener/owner/UpdateOwnerInfoListener.java
@@ -1,4 +1,4 @@
package com.java110.community.listener.owner;
package com.java110.user.listener.owner;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -7,10 +7,10 @@
import com.java110.common.constant.StatusConstant;
import com.java110.common.exception.ListenerExecuteException;
import com.java110.common.util.Assert;
import com.java110.community.dao.IOwnerServiceDao;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.entity.center.Business;
import com.java110.user.dao.IOwnerServiceDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
File was renamed from CommunityService/src/main/java/com/java110/community/smo/impl/OwnerInnerServiceSMOImpl.java
@@ -1,14 +1,14 @@
package com.java110.community.smo.impl;
package com.java110.user.smo.impl;
import com.java110.common.util.BeanConvertUtil;
import com.java110.community.dao.IOwnerServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.OwnerDto;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.user.dao.IOwnerServiceDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
docs/services/owner/DeleteOwnerInfo.md
@@ -5,7 +5,7 @@
> API服务做删除业主时调用该接口
###### URL
> [http://community-service/ownerApi/service](http://community-service/ownerApi/service)
> [http://user-service/ownerApi/service](http://user-service/ownerApi/service)
###### 支持格式
> JSON
@@ -41,7 +41,7 @@
|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
|-|business|?|Array|-|业务节点|-|
|business|businessTypeCd|1|String|12|业务类型编码|500100030002|
|business|businessTypeCd|1|String|12|业务类型编码|110100030002|
|business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
|datas|businessOwnerInfo|1|Object|-|小区成员|小区成员|
|businessOwnerInfo|ownerId|1|String|30|-|-|
@@ -58,7 +58,7 @@
###### 举例
> 地址:[http://community-service/ownerApi/service](http://community-service/ownerApi/service)
> 地址:[http://user-service/ownerApi/service](http://user-service/ownerApi/service)
``` javascript
请求头信息:
@@ -82,7 +82,7 @@
    }]
  },
  "business": {
    "businessTypeCd": "540100050001",
    "businessTypeCd": "110100050001",
    "bId":"1234567892",
    "remark": "备注",
    "datas": {
docs/services/owner/SaveOwnerInfo.md
@@ -5,7 +5,7 @@
> API服务做保存业主时调用该接口
###### URL
> [http://community-service/ownerApi/service](http://community-service/ownerApi/service)
> [http://user-service/ownerApi/service](http://user-service/ownerApi/service)
###### 支持格式
> JSON
@@ -41,7 +41,7 @@
|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
|-|business|?|Array|-|业务节点|-|
|business|businessTypeCd|1|String|12|业务类型编码|500100030002|
|business|businessTypeCd|1|String|12|业务类型编码|110100040002|
|business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
|datas|businessOwnerInfo|1|Object|-|小区成员|小区成员|
|businessOwnerInfo|sex|1|String|30|-|-|
@@ -64,7 +64,7 @@
###### 举例
> 地址:[http://community-service/ownerApi/service](http://community-service/ownerApi/service)
> 地址:[http://user-service/ownerApi/service](http://user-service/ownerApi/service)
``` javascript
请求头信息:
@@ -88,7 +88,7 @@
    }]
  },
  "business": {
    "businessTypeCd": "540100030001",
    "businessTypeCd": "110100030001",
    "remark": "备注",
    "datas": {
      "businessOwnerInfo": {
docs/services/owner/UpdateOwnerInfo.md
@@ -5,7 +5,7 @@
> API服务做修改业主时调用该接口
###### URL
> [http://community-service/ownerApi/service](http://community-service/ownerApi/service)
> [http://user-service/ownerApi/service](http://user-service/ownerApi/service)
###### 支持格式
> JSON
@@ -41,7 +41,7 @@
|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
|-|business|?|Array|-|业务节点|-|
|business|businessTypeCd|1|String|12|业务类型编码|500100030002|
|business|businessTypeCd|1|String|12|业务类型编码|110100050002|
|business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
|datas|businessOwnerInfo|1|Object|-|小区成员|小区成员|
|businessOwnerInfo|sex|1|String|30|-|-|
@@ -64,7 +64,7 @@
###### 举例
> 地址:[http://community-service/ownerApi/service](http://community-service/ownerApi/service)
> 地址:[http://user-service/ownerApi/service](http://user-service/ownerApi/service)
``` javascript
请求头信息:
@@ -88,7 +88,7 @@
    }]
  },
  "business": {
    "businessTypeCd": "540100040001",
    "businessTypeCd": "110100040001",
    "bId":"1234567892",
    "remark": "备注",
    "datas": {
docs/start/vedio.md
@@ -5,12 +5,12 @@
## 小区管理系统代码分享视频
    [点这里](http://www.iqiyi.com/w_19s7u6le2p.html#vfrm=16-1-1-1)
[点这里](http://www.iqiyi.com/w_19s7u6le2p.html#vfrm=16-1-1-1)
## 小区管理系统服务端开发讲解
    [点这里](http://www.iqiyi.com/w_19s7omicex.html#curid=38432723509_ef5ddb9c572fa848bcdd80f193d78eeb)
[点这里](http://www.iqiyi.com/w_19s7omicex.html#curid=38432723509_ef5ddb9c572fa848bcdd80f193d78eeb)
java110-common/src/main/java/com/java110/common/constant/BusinessTypeConstant.java
@@ -57,6 +57,22 @@
     */
    public static final String BUSINESS_TYPE_RECOVER_USER_INFO = "100100040003";
    /**
     * 增加业主
     */
    public static final String BUSINESS_TYPE_SAVE_OWNER_INFO = "110100030001";
    /**
     * 修改业主
     */
    public static final String BUSINESS_TYPE_UPDATE_OWNER_INFO = "110100040001";
    /**
     * 删除业主
     */
    public static final String BUSINESS_TYPE_DELETE_OWNER_INFO = "110100050001";
@@ -222,23 +238,6 @@
     * 删除房屋
     */
    public static final String BUSINESS_TYPE_DELETE_ROOM_INFO = "530100050001";
    /**
     * 增加业主
     */
    public static final String BUSINESS_TYPE_SAVE_OWNER_INFO = "540100030001";
    /**
     * 修改业主
     */
    public static final String BUSINESS_TYPE_UPDATE_OWNER_INFO = "540100040001";
    /**
     * 删除业主
     */
    public static final String BUSINESS_TYPE_DELETE_OWNER_INFO = "540100050001";
java110-core/src/main/java/com/java110/core/smo/owner/IOwnerInnerServiceSMO.java
@@ -17,7 +17,7 @@
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
@FeignClient(name = "user-service", configuration = {FeignConfiguration.class})
@RequestMapping("/ownerApi")
public interface IOwnerInnerServiceSMO {