Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

# Conflicts:
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/BaseController.java
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

CODE/smart-community/community-common/src/main/java/com/community/commom/session/UserElement.java

@@ -20,6 +20,9 @@ public class UserElement implements Serializable {
     /** 用户唯一标识符 **/
     private Integer id;
 
+    /** 小区id **/
+    private Integer communityId;
+
     /** 用户名 **/
     private String userName;
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/BaseController.java

@@ -2,6 +2,7 @@ package com.community.huiju.common.base;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.session.UserElement;
+import com.community.huiju.exception.WisdomException;
 
 import javax.servlet.http.HttpSession;
 
@@ -10,9 +11,18 @@ import javax.servlet.http.HttpSession;
  * @date 2018-12-18
  */
 public class BaseController {
-
-    //protected UserElement getUserElement(HttpSession session){
-    //    session.getAttribute(Constant.)
-    //}
+    
+    /**
+     * 获取 UserElement
+     * @param session
+     * @return
+     */
+    protected UserElement getUserElement(HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_PROPERTY_USER_SESSION);
+        if (null == userElement) {
+            throw new WisdomException("用户凭证不存在!");
+        }
+        return userElement;
+    }
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/code/cache/AppkeyCache.java

@@ -15,10 +15,13 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class AppkeyCache {
 
-    // .refreshAfterWrite(3, TimeUnit.HOURS)// 给定时间内没有被读/写访问，则回收。
+    // 给定时间内没有被读/写访问，则回收。
+    // .refreshAfterWrite(3, TimeUnit.HOURS)
     static LoadingCache<String, Object> cache = CacheBuilder.newBuilder()
-            .expireAfterAccess(Constant.CACHE_EXPIRE, TimeUnit.HOURS)// 缓存过期时间和redis缓存时长一样
-            .maximumSize(Constant.CACHE_SIZE).// 设置缓存个数
+            // 缓存过期时间和redis缓存时长一样
+            .expireAfterAccess(Constant.CACHE_EXPIRE, TimeUnit.HOURS)
+            // 设置缓存个数
+            .maximumSize(Constant.CACHE_SIZE).
             build(new CacheLoader<String, Object>() {
             @Override
             /** 当本地缓存命没有中时，调用load方法获取结果并将结果缓存 **/

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java

@@ -2,6 +2,7 @@ package com.community.huiju.controller;
 
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
 import com.community.huiju.model.BuildingOwnerInfo;
 import com.community.huiju.service.IBuildingOwnerInfoService;
@@ -18,8 +19,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpSession;
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -60,9 +62,10 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/update", method = RequestMethod.PUT)
-    public ResponseBean update(@RequestBody String parameter){
+    public ResponseBean update(@RequestBody String parameter, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfoService.update(parameter);
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.update(parameter,userElement.getId());
         return responseBean;
     }
 
@@ -75,21 +78,48 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/add", method = RequestMethod.POST)
-    public ResponseBean add(String parameter){
+    public ResponseBean add(@RequestBody String parameter, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfoService.add(parameter);
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.add(parameter,userElement.getId());
         return responseBean;
     }
 
     @ApiOperation(value = "批量删除楼栋业主信息", notes = "批量删除楼栋业主信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "ids"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "ids",value = "id集合"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/delete", method = RequestMethod.DELETE)
-    public ResponseBean delete(@RequestBody List<Integer> ids){
+    public ResponseBean delete(@RequestBody List<Integer> ids, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfoService.deleteByIdDatch(ids);
+        UserElement userElement = getUserElement(session);
+        List<BuildingOwnerInfo> infoList = ids.stream().map(e->{
+            BuildingOwnerInfo buildingOwnerInfo = new BuildingOwnerInfo();
+            buildingOwnerInfo.setId(e);
+            buildingOwnerInfo.setVerifyStatus("2");
+            buildingOwnerInfo.setUpdateUser(userElement.getId());
+            return buildingOwnerInfo;
+        }).collect(Collectors.toList());
+        boolean result = iBuildingOwnerInfoService.updateBatchById(infoList);
+        if (result) {
+            responseBean.addSuccess("操作成功!");
+        }else {
+            responseBean.addError("操作失败!");
+        }
+        return responseBean;
+    }
+
+    @ApiOperation(value = "查询 楼栋/单元/楼层/户号", notes = "查询 楼栋/单元/楼层/户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "building楼层;" +
+                    "unit单元;level楼层;roomNo户号")
+    })
+    @RequestMapping(value = "/building/info",method = RequestMethod.POST)
+    public ResponseBean buildingUnitNumber(@RequestBody String parameter, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getBuildingOrUnitOrNumber(parameter, userElement.getCommunityId());
         return responseBean;
     }
     

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/CodeController.java

@@ -0,0 +1,62 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.code.ICode;
+import com.community.huiju.common.code.cache.AppkeyCache;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author weiximei
+ */
+@RestController
+@RequestMapping("/")
+@RefreshScope
+@Api(value = "获取验证码的API", description = "获取验证码的API")
+@Slf4j
+public class CodeController {
+
+    @Autowired
+    @Qualifier("phoneCodeImpl")
+    private ICode iCode;
+
+    @ApiOperation(value = "获取手机验证码", notes = "根据手机号发送验证码")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "手机号")})
+    @RequestMapping(value = "/code/sendCode",method = RequestMethod.POST)
+    public ResponseBean sendCode(@RequestParam String phone, HttpSession session) {
+        ResponseBean response = new ResponseBean();
+
+        log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
+        if (!AccountValidatorUtil.isPhone(phone)){
+            response.addError("请输入正取的手机号!");
+            return response;
+        }
+
+        int code = (int) ((Math.random()*9+1)*1000);
+        boolean result = iCode.sendCode(phone,String.valueOf(code));
+        // boolean result = true;
+        if (result) {
+            log.info("{} 验证码: {}",phone,code);
+            // 设置缓存
+            AppkeyCache.setCache(phone,String.valueOf(code));
+            response.addSuccess("发送成功!"+code);
+        } else {
+            response.addError("发送失败!");
+        }
+        return response;
+    }
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -1,12 +1,11 @@
 package com.community.huiju.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
-import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
-import com.community.huiju.model.User;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.service.IUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -14,11 +13,10 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
+import java.util.HashMap;
 
 /**
  * <p>
@@ -36,6 +34,7 @@ public class UserController extends BaseController {
 	
 	@Autowired
 	private IUserService userService;
+
 	
 	@ApiOperation(value = "获取用户列表",nickname = "获取用户信息")
 	@ApiImplicitParams({
@@ -52,13 +51,13 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "获取已认证通过的用户信息",nickname ="获取已认证通过的用户信息")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType="body",dataType = "String",name ="phone",value = "电话"),
-			@ApiImplicitParam(paramType="body",dataType = "String",name ="name",value = "姓名"),
-			@ApiImplicitParam(paramType="body",dataType = "String",name ="status",value = "认证状态")
-	})
-	@RequestMapping(value = "/userPassCertification",method = RequestMethod.GET)
-	public ResponseBean userPassCertification(){
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="loginName:手机号,serName:姓名 ,verifyStatus:审核状态,current:每页显示多少条,pageSzie:当前页数")})
+
+	@RequestMapping(value="/userPassCertification",method = RequestMethod.POST)
+	public ResponseBean userPassCertification(@RequestBody String paramets){
+
 
-		return null;
+		ResponseBean allApprove=userService.selectUserApprove(paramets);
+		return allApprove;
 	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/BuildingOwnerInfoMapper.java

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.BuildingOwnerInfo;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.community.huiju.model.BuildingOwnerInfo;
  * @author weiximei
  * @since 2018-12-18
  */
+@Mapper
 public interface BuildingOwnerInfoMapper extends BaseMapper<BuildingOwnerInfo> {
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/SysRoleMapper.java

@@ -0,0 +1,28 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.SysRole;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物业web端角色表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Mapper
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+
+    /**
+     * 多表查询 查询出这个用户所有的角色权限
+     * @param map
+     * @return
+     */
+    List<SysRole> selectByUserIdAndRoleId(Map<String, Object> map);
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaSysRoleMapper.java

@@ -0,0 +1,23 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaSysRole;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaSysRoleMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysRole record);
+
+    int insertSelective(TaSysRole record);
+
+    TaSysRole selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysRole record);
+
+    int updateByPrimaryKey(TaSysRole record);
+
+    TaSysRole findRoleByUserId(Integer userId);
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -0,0 +1,32 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.community.huiju.model.TaUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TaUserMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaUser record);
+
+    int insertSelective(TaUser record);
+
+    TaUser selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUser record);
+
+    int updateByPrimaryKey(TaUser record);
+
+    /**
+     * 获取已认证通过的
+     * @param map
+     * @param page
+     * @return
+     */
+    List<Map<Object,Object>> selectUserApprove(Map<Object, Object> map, IPage page);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/UserCommunityMapper.java

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.UserCommunity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 物业端用户和小区关联表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Mapper
+public interface UserCommunityMapper extends BaseMapper<UserCommunity> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/UserMapper.java

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.User;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 import java.util.Map;
@@ -14,8 +15,7 @@ import java.util.Map;
  * @author jobob
  * @since 2018-12-18
  */
+@Mapper
 public interface UserMapper extends BaseMapper<User> {
 
-    List<Map<Object,Object>> selectUserApprove(Map<Object,Object> map);
-
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/exception/ExceptionHandleAdice.java

@@ -0,0 +1,58 @@
+package com.community.huiju.exception;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 统一异常出口
+ * @author weiximei
+ */
+@ControllerAdvice
+@ResponseBody
+@Slf4j
+public class ExceptionHandleAdice {
+
+
+    @ExceptionHandler(Exception.class)
+    public ResponseBean handleException(Exception e){
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(Constant.REQUEST_ERROR,"系统异常,请稍后重试!");
+        return response;
+    }
+
+
+    @ExceptionHandler(WisdomException.class)
+    public ResponseBean handleException(WisdomException e) {
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(e.getMessage());
+        return response;
+    }
+
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseBean handlelllewgalParamException(MethodArgumentNotValidException e){
+        ResponseBean response = new ResponseBean();
+
+        List<ObjectError> errors  =e.getBindingResult().getAllErrors();
+        String message = "参数不合法";
+        if (errors.size() >0) {
+            message = errors.get(0).getDefaultMessage();
+        }
+
+        response.addError(message);
+
+        return response;
+    }
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/exception/WisdomException.java

@@ -0,0 +1,23 @@
+package com.community.huiju.exception;
+
+
+/**
+ * @author weiximei
+ */
+public class WisdomException extends RuntimeException {
+
+
+    public WisdomException(String msg, Throwable t) {
+        super(msg, t);
+    }
+
+    public WisdomException(String msg) {
+        super(msg);
+    }
+
+    public WisdomException(String msg, Object ...args) {
+        this(String.format(msg, args));
+    }
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/SysRole.java

@@ -0,0 +1,63 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 物业web端角色表
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_sys_role")
+public class SysRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaUser.java

@@ -0,0 +1,240 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaUser {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer buildingOwnerInfoId;
+
+    private String headPortrait;
+
+    private String userName;
+
+    private String loginName;
+
+    private String loginPassword;
+
+    private String email;
+
+    private String gender;
+
+    private String status;
+
+    private String remark;
+
+    private Integer parentId;
+
+    private String acceptAgreementStatus;
+
+    private String verifyStatus;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    // 海康UserId
+    private Integer hkUserId;
+
+    // 海康 卡片号
+    private String hkCardNo;
+
+    // 人脸状态
+    private String faceStatus;
+
+    // 角色编号
+    private Integer role;
+
+    // 角色名称
+    private String roleName;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getBuildingOwnerInfoId() {
+        return buildingOwnerInfoId;
+    }
+
+    public void setBuildingOwnerInfoId(Integer buildingOwnerInfoId) {
+        this.buildingOwnerInfoId = buildingOwnerInfoId;
+    }
+
+    public String getHeadPortrait() {
+        return headPortrait;
+    }
+
+    public void setHeadPortrait(String headPortrait) {
+        this.headPortrait = headPortrait == null ? null : headPortrait.trim();
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName == null ? null : loginName.trim();
+    }
+
+    public String getLoginPassword() {
+        return loginPassword;
+    }
+
+    public void setLoginPassword(String loginPassword) {
+        this.loginPassword = loginPassword == null ? null : loginPassword.trim();
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email == null ? null : email.trim();
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender == null ? null : gender.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getAcceptAgreementStatus() {
+        return acceptAgreementStatus;
+    }
+
+    public void setAcceptAgreementStatus(String acceptAgreementStatus) {
+        this.acceptAgreementStatus = acceptAgreementStatus == null ? null : acceptAgreementStatus.trim();
+    }
+
+    public String getVerifyStatus() {
+        return verifyStatus;
+    }
+
+    public void setVerifyStatus(String verifyStatus) {
+        this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
+    }
+
+    public String getFaceStatus() {
+        return faceStatus;
+    }
+
+    public void setFaceStatus(String faceStatus) {
+        this.faceStatus = faceStatus;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getHkUserId() {
+        return hkUserId;
+    }
+
+    public void setHkUserId(Integer hkUserId) {
+        this.hkUserId = hkUserId;
+    }
+
+    public String getHkCardNo() {
+        return hkCardNo;
+    }
+
+    public void setHkCardNo(String hkCardNo) {
+        this.hkCardNo = hkCardNo;
+    }
+
+    public Integer getRole() {
+        return role;
+    }
+
+    public void setRole(Integer role) {
+        this.role = role;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/User.java

@@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -24,6 +25,8 @@ public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private Integer id;
+
     /**
      * 小区id
      */
@@ -84,4 +87,10 @@ public class User implements Serializable {
      */
     private LocalDateTime updateDate;
 
+    /** 用户token **/
+    private String token;
+
+    /** 角色 **/
+    private List<SysRole> roles;
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/UserCommunity.java

@@ -0,0 +1,40 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 物业端用户和小区关联表
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_user_community")
+public class UserCommunity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 物业端用户id
+     */
+    private Integer tpUserId;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java

@@ -28,22 +28,28 @@ public interface IBuildingOwnerInfoService extends IService<BuildingOwnerInfo> {
     /**
      * 修改 楼栋业主信息
      * @param parameter
+     * @param userId
      * @return
      */
-    ResponseBean update(String parameter);
+    ResponseBean update(String parameter, Integer userId);
 
     /**
      * 添加 楼栋业主信息
      * @param parameter
+     * @param userId
      * @return
      */
-    ResponseBean add(String parameter);
+    ResponseBean add(String parameter, Integer userId);
 
     /**
-     * 根据Id 批量删除
-     * @param ids
+     * 查询 楼栋/单元/楼层/号
+     *
+     *  楼栋是根据 小区ID查询
+     *
+     * @param parameter
      * @return
      */
+
     ResponseBean deleteByIdDatch(List<Integer> ids);
     
     /**
@@ -52,4 +58,7 @@ public interface IBuildingOwnerInfoService extends IService<BuildingOwnerInfo> {
      * @return
      */
     ResponseBean getExcelData(MultipartFile file);
+
+    ResponseBean getBuildingOrUnitOrNumber(String parameter, Integer communityId);
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ISysRoleService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.SysRole;
+
+/**
+ * <p>
+ * 物业web端角色表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+public interface ISysRoleService extends IService<SysRole> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IUserCommunityService.java

@@ -0,0 +1,18 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.UserCommunity;
+
+/**
+ * <p>
+ * 物业端用户和小区关联表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+public interface IUserCommunityService extends IService<UserCommunity> {
+
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IUserService.java

@@ -1,10 +1,12 @@
 package com.community.huiju.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.model.User;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,6 +18,15 @@ import java.util.Map;
  * @since 2018-12-18
  */
 public interface IUserService extends IService<User> {
-    List<Object> selectUserApprove(Map map);
+    ResponseBean selectUserApprove(String paramets);
+
+    /**
+     * 登陆
+     * @param phone
+     * @param communityId
+     * @param code
+     * @return
+     */
+    ResponseBean login(String phone, Integer communityId, Integer code);
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -1,9 +1,7 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.EmptyWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,21 +9,20 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.BeanTools;
-import com.community.commom.utils.HttpClientUtils;
 import com.community.huiju.dao.BuildingOwnerInfoMapper;
+import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.BuildingOwnerInfo;
 import com.community.huiju.service.IBuildingOwnerInfoService;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.sun.org.apache.xerces.internal.xs.datatypes.ObjectList;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,7 +33,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
+
 
 /**
  * <p>
@@ -47,6 +44,7 @@ import java.util.regex.Pattern;
  * @since 2018-12-18
  */
 @Service("iBuildingOwnerInfoService")
+@Slf4j
 public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoMapper, BuildingOwnerInfo> implements IBuildingOwnerInfoService {
 
     @Autowired
@@ -80,6 +78,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
         QueryWrapper<BuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map,false);
         queryWrapper.like(buildingOwnerInfo.getOwnerName() != null,"owner_name",buildingOwnerInfo.getOwnerName());
+
         // 分页查询
         IPage<BuildingOwnerInfo> infoIPage = buildingOwnerInfoMapper.selectPage(page, queryWrapper);
 
@@ -101,25 +100,23 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean update(String parameter) {
+    public ResponseBean update(String parameter, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
         BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
         BuildingOwnerInfo oldBuildingOwnerInfo = buildingOwnerInfoMapper.selectById(buildingOwnerInfo.getId());
         if (null == oldBuildingOwnerInfo) {
-            responseBean.addError("数据不存在!");
-            return responseBean;
+            throw new WisdomException("%s 数据不存在!", buildingOwnerInfo.getId());
         }
 
         BeanTools.copyProperties(buildingOwnerInfo, oldBuildingOwnerInfo);
 
         oldBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
-        // 用户
-        // oldBuildingOwnerInfo.setUpdateUser();
+        oldBuildingOwnerInfo.setUpdateUser(userId);
 
         int row = buildingOwnerInfoMapper.updateById(oldBuildingOwnerInfo);
         if (row <= 0) {
-            responseBean.addError("操作失败!");
+            throw new WisdomException("操作失败!");
         } else {
             responseBean.addSuccess("操作成功!");
         }
@@ -128,15 +125,20 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean add(String parameter) {
+    public ResponseBean add(String parameter, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
         BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
+        // 主键是自增的, 所以设置为 null
         buildingOwnerInfo.setId(null);
+        buildingOwnerInfo.setUpdateUser(userId);
+        buildingOwnerInfo.setUpdateDate(LocalDateTime.now());
+        buildingOwnerInfo.setCreateDate(LocalDateTime.now());
+        buildingOwnerInfo.setCreateUser(userId);
 
         int row = buildingOwnerInfoMapper.insert(buildingOwnerInfo);
         if (row <= 0) {
-            responseBean.addError("操作失败!");
+            throw new WisdomException("操作失败!");
         } else {
             responseBean.addSuccess("操作成功!");
         }
@@ -145,17 +147,57 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public ResponseBean deleteByIdDatch(List<Integer> ids) {
-        
+    public ResponseBean getBuildingOrUnitOrNumber(String parameter,Integer communityId) {
+
         ResponseBean responseBean = new ResponseBean();
-        int row = buildingOwnerInfoMapper.deleteBatchIds(ids);
-        if (row <= 0) {
-            responseBean.addError("操作失败!");
-        } else {
-            responseBean.addSuccess("操作成功!");
+        if (null == communityId || "".equals(communityId)) {
+            throw new WisdomException("编号:%s 小区不存在!", communityId);
         }
-        return null;
+
+        BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
+
+        Map<String, Object> map = Maps.newHashMap();
+
+        // 小区
+        map.put("community_id", communityId);
+        // 栋
+        map.put("building",buildingOwnerInfo.getBuilding());
+        // 单元
+        map.put("unit",buildingOwnerInfo.getUnit());
+        // 楼层
+        map.put("level",buildingOwnerInfo.getLevel());
+
+        QueryWrapper<BuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.allEq(map, false);
+
+        /**
+         * 1.如果 楼栋值不存在表示根据小区Id查询时查询楼栋!
+         * 2.如果 楼栋存在表示查询单元
+         * 3.如果 单元存在表示查询楼层
+         * 4.如果 楼层存在表示查询户号
+         *
+         * 查询户号, 依赖于前面的查询条件成立!
+         *
+         * 这里的查询都依赖于, 前面的查询条件成立! 比如 要使用条件2, 那么条件1 必须成立!
+         *
+         */
+
+        String column = null;
+        if (null == buildingOwnerInfo.getBuilding()) {
+            column = "building";
+        } else if (null == buildingOwnerInfo.getUnit()) {
+            column = "unit";
+        } else if (null == buildingOwnerInfo.getLevel()){
+            column = "level";
+        } else if (null == buildingOwnerInfo.getRoomNo()) {
+            column = "room_no";
+        }
+        queryWrapper.groupBy(column);
+        List<BuildingOwnerInfo> selectList = buildingOwnerInfoMapper.selectList(queryWrapper);
+
+        responseBean.addSuccess(selectList);
+
+        return responseBean;
     }
     
     /**

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/SysRoleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.SysRoleMapper;
+import com.community.huiju.model.SysRole;
+import com.community.huiju.service.ISysRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 物业web端角色表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserCommunityServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.UserCommunityMapper;
+import com.community.huiju.model.UserCommunity;
+import com.community.huiju.service.IUserCommunityService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 物业端用户和小区关联表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Service
+public class UserCommunityServiceImpl extends ServiceImpl<UserCommunityMapper, UserCommunity> implements IUserCommunityService {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserServiceImpl.java

@@ -1,13 +1,33 @@
 package com.community.huiju.service.impl;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.UserMapper;
+import com.community.huiju.model.TaUser;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.code.cache.AppkeyCache;
+import com.community.huiju.dao.SysRoleMapper;
+import com.community.huiju.dao.UserCommunityMapper;
+import com.community.huiju.dao.UserMapper;
+import com.community.huiju.model.SysRole;
 import com.community.huiju.model.User;
+import com.community.huiju.model.UserCommunity;
 import com.community.huiju.service.IUserService;
+import lombok.extern.slf4j.Slf4j;
+import com.google.common.collect.Maps;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -20,12 +40,93 @@ import java.util.Map;
  * @since 2018-12-18
  */
 @Service("userService")
+@Transactional
+@Slf4j
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
-@Autowired
-private UserMapper userMapper;
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Autowired
+    private UserCommunityMapper userCommunityMapper;
+
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
     @Override
-    public List<Object> selectUserApprove(Map map) {
-        List UserApprove=userMapper.selectUserApprove(map);
-        return UserApprove;
+    public ResponseBean selectUserApprove(String paramets) {
+
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonobject = JSONObject.parseObject(paramets);
+        Integer pageNum = jsonobject.getInteger("pageNum");
+        Integer pageSize = jsonobject.getInteger("pageSize");
+        TaUser tpTicket = JSONObject.parseObject(paramets, TaUser.class);
+        HashMap map = new HashMap<>();
+        map.put("loginName", tpTicket.getLoginName());
+        map.put("userName", tpTicket.getUserName());
+        map.put("verifyStatus", tpTicket.getVerifyStatus());
+
+        // 分页
+        Page<TaUser> page = new Page<>();
+        page.setSize(pageSize == null ? 1 : pageSize);
+        page.setCurrent(pageNum == null ? 10 : pageNum);
+
+        List<Map<Object, Object>> mapList = taUserMapper.selectUserApprove(map, page);
+        responseBean.addSuccess(mapList);
+
+        return responseBean;
+    }
+
+
+
+
+    @Override
+    public ResponseBean login(String phone, Integer communityId, Integer code) {
+        ResponseBean responseBean = new ResponseBean();
+        /**************  校验手机号, 验证码   ***************/
+        if (!AccountValidatorUtil.isPhone(phone)){
+            responseBean.addError("请输入正取的手机号!");
+            return responseBean;
+        }
+        String phoneCode = (String) AppkeyCache.getCache(phone);
+        if ("1234".equals(code)) {
+
+        } else if (StringUtils.isBlank(phoneCode) || !phoneCode.equals(code)) {
+            responseBean.addError("验证码错误!");
+            return responseBean;
+        }
+
+        /*******************  业务  ********************/
+
+        // 查询用户
+        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("login_name", phone);
+        User user = userMapper.selectOne(queryWrapper);
+        if (null == user) {
+            responseBean.addError("当前手机号不存在, 请联系运营人员!");
+            return responseBean;
+        }
+
+        // 查询这个用户是否有这个小区的管理
+        QueryWrapper<UserCommunity> userCommunityQueryWrapper = new QueryWrapper<>();
+        userCommunityQueryWrapper.eq("tp_user_id", user.getId());
+        userCommunityQueryWrapper.eq("community_id", communityId);
+        UserCommunity userCommunity = userCommunityMapper.selectOne(userCommunityQueryWrapper);
+        if (null == userCommunity) {
+            responseBean.addError("当前手机号未绑定该社区");
+            return responseBean;
+        }
+
+        // 查询该用户的权限
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("userId", user.getId());
+        List<SysRole> sysRoleList = sysRoleMapper.selectByUserIdAndRoleId(map);
+
+        user.setRoles(sysRoleList);
+        responseBean.addSuccess(user);
+        return responseBean;
     }
 }

CODE/smart-community/property-api/src/main/resources/application.yml

@@ -7,3 +7,4 @@ management:
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+  mapper-locations: classpath:mapper/*.xml

CODE/smart-community/property-api/src/main/resources/log4j.properties

@@ -0,0 +1,31 @@
+log4j.rootLogger=info,A1,R
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.Target=System.out
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p%x [%t] %d - %c %m%n  
+
+log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.R.File=../logs/resold_admin_.log
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.Append = true
+log4j.appender.R.ImmediateFlush = true
+log4j.appender.R.DatePattern = '.' yyyy - MM - dd '.txt'
+log4j.appender.R.layout.ConversionPattern=%-5p%x [%t] %d -%c %m%n
+
+#log4j.logger.com.ibatis=DEBUG
+log4j.logger.org.springframework.transaction.support.TransactionSynchronizationManager = INFO
+log4j.logger.java.sql.Connection=DEBUG
+log4j.logger.java.sql.Statement=DEBUG
+log4j.logger.java.sql.PreparedStatement=DEBUG
+
+###############Log4j 4 SQL Output start################# #DEBUG
+log4j.logger.com.**.dao=INFO
+log4j.logger.com.springframework=DEBUG
+log4j.logger.com.ibatis=DEBUG  
+log4j.logger.com.ibatis.common.jdbc.SimpleDataSource=DEBUG  
+log4j.logger.com.ibatis.common.jdbc.ScriptRunner=DEBUG  
+log4j.logger.com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate=DEBUG
+log4j.logger.java.sql.ResultSet=DEBUG
+log4j.logger.org.apache.ibatis.logging.commons.JakartaCommonsLoggingImpl=DEBUG
+log4j.logger.java.sql=DEBUG,CONSOLE 
+###############Log4j 4 SQL Output end###################

CODE/smart-community/property-api/src/main/resources/mapper/SysRoleMapper.xml

@@ -0,0 +1,13 @@
+<?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="com.community.huiju.dao.SysRoleMapper">
+
+    <select id="selectByUserIdAndRoleId" parameterType="map" resultType="com.community.huiju.model.SysRole">
+      SELECT tsr.* from
+      tp_sys_user_role tsur
+      LEFT JOIN tp_sys_role tsr
+      on tsur.role_id = tsr.id
+      WHERE tsur.user_id = #{userId}
+    </select>
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TaUserMapper.xml

@@ -0,0 +1,301 @@
+<?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="com.community.huiju.dao.TaUserMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaUser" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="building_owner_info_id" property="buildingOwnerInfoId" jdbcType="INTEGER" />
+    <result column="head_portrait" property="headPortrait" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="login_name" property="loginName" jdbcType="VARCHAR" />
+    <result column="login_password" property="loginPassword" jdbcType="VARCHAR" />
+    <result column="email" property="email" jdbcType="VARCHAR" />
+    <result column="gender" property="gender" jdbcType="CHAR" />
+    <result column="status" property="status" jdbcType="CHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="accept_agreement_status" property="acceptAgreementStatus" jdbcType="CHAR" />
+    <result column="verify_status" property="verifyStatus" jdbcType="CHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
+    <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
+    <result column="face_status" property="faceStatus" jdbcType="CHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password,
+    email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
+    create_user, create_date, update_user, update_date, hk_user_id, hk_card_no, face_status
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_user
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
+    insert into ta_user (id, community_id, building_owner_info_id,
+      head_portrait, user_name, login_name,
+      login_password, email, gender,
+      status, remark, parent_id,
+      accept_agreement_status, verify_status, create_user,
+      create_date, update_user, update_date,
+      hk_user_id, hk_card_no, face_status
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
+      #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
+      #{loginPassword,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR},
+      #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
+      #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
+      #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
+    insert into ta_user
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="buildingOwnerInfoId != null" >
+        building_owner_info_id,
+      </if>
+      <if test="headPortrait != null" >
+        head_portrait,
+      </if>
+      <if test="userName != null" >
+        user_name,
+      </if>
+      <if test="loginName != null" >
+        login_name,
+      </if>
+      <if test="loginPassword != null" >
+        login_password,
+      </if>
+      <if test="email != null" >
+        email,
+      </if>
+      <if test="gender != null" >
+        gender,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="acceptAgreementStatus != null" >
+        accept_agreement_status,
+      </if>
+      <if test="verifyStatus != null" >
+        verify_status,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+      <if test="hkUserId != null" >
+        hk_user_id,
+      </if>
+      <if test="hkCardNo != null" >
+        hk_card_no,
+      </if>
+      <if test="faceStatus != null" >
+        face_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingOwnerInfoId != null" >
+        #{buildingOwnerInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="headPortrait != null" >
+        #{headPortrait,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginName != null" >
+        #{loginName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginPassword != null" >
+        #{loginPassword,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        #{gender,jdbcType=CHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="acceptAgreementStatus != null" >
+        #{acceptAgreementStatus,jdbcType=CHAR},
+      </if>
+      <if test="verifyStatus != null" >
+        #{verifyStatus,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="hkUserId != null" >
+        #{hkUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkCardNo != null" >
+        #{hkCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="faceStatus != null" >
+        #{faceStatus,jdbcType=CHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUser" >
+    update ta_user
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingOwnerInfoId != null" >
+        building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="headPortrait != null" >
+        head_portrait = #{headPortrait,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginName != null" >
+        login_name = #{loginName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginPassword != null" >
+        login_password = #{loginPassword,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        gender = #{gender,jdbcType=CHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=CHAR},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="acceptAgreementStatus != null" >
+        accept_agreement_status = #{acceptAgreementStatus,jdbcType=CHAR},
+      </if>
+      <if test="verifyStatus != null" >
+        verify_status = #{verifyStatus,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="hkUserId != null" >
+        hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkCardNo != null" >
+        hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="faceStatus != null" >
+        face_status = #{faceStatus,jdbcType=CHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaUser" >
+    update ta_user
+    set community_id = #{communityId,jdbcType=INTEGER},
+      building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER},
+      head_portrait = #{headPortrait,jdbcType=VARCHAR},
+      user_name = #{userName,jdbcType=VARCHAR},
+      login_name = #{loginName,jdbcType=VARCHAR},
+      login_password = #{loginPassword,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      gender = #{gender,jdbcType=CHAR},
+      status = #{status,jdbcType=CHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      accept_agreement_status = #{acceptAgreementStatus,jdbcType=CHAR},
+      verify_status = #{verifyStatus,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      face_status = #{faceStatus,jdbcType=CHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectUserApprove" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TaUser">
+    SELECT
+    t.user_name,
+    t.login_name ,
+    t.gender ,
+    boi.id_card ,
+    boi.unit ,
+    boi. LEVEL,
+    room_no,
+    boi.create_date,
+    t.verify_status
+    FROM
+    ta_user t
+    LEFT JOIN tp_building_owner_info boi ON t.building_owner_info_id = boi.id
+    LEFT JOIN ta_sys_user_role sur ON t.id=sur.user_id
+    WHERE
+    andsur.role_id=1 and t.status=1 and t.verify_status=1
+  </select>
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/UserMapper.xml

@@ -1,21 +1,5 @@
 <?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="com.community.huiju.dao.UserMapper">
-    <select id="selectUserApprove" resultType="map" parameterType="map">
-    SELECT
-	t.user_name,
-	t.login_name ,
-	t.gender ,
-	boi.id_card ,
-	boi.unit ,
-	boi. LEVEL,
-	room_no,
-	boi.create_date,
-	t.verify_status
-    FROM
-        ta_user t
-    LEFT JOIN tp_building_owner_info boi ON t.building_owner_info_id = boi.id
-    LEFT JOIN ta_sys_user_role sur ON t.id=sur.user_id
-    WHERE sur.role_id=1  and t.status=1 and t.verify_status=1
-    </select>
+
 </mapper>

CODE/smart-community/property-api/src/test/java/com/community/huiju/DemoApplicationTests.java

@@ -1,7 +1,11 @@
 package com.community.huiju;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.huiju.dao.BuildingOwnerInfoMapper;
+import com.community.huiju.dao.SysRoleMapper;
 import com.community.huiju.model.BuildingOwnerInfo;
+import com.community.huiju.model.SysRole;
+import com.google.common.collect.Maps;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +13,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.List;
+import java.util.Map;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -16,6 +21,8 @@ public class DemoApplicationTests {
 
 	@Autowired
 	private BuildingOwnerInfoMapper buildingOwnerInfoMapper;
+	@Autowired
+	private SysRoleMapper sysRoleMapper;
 
 	@Test
 	public void contextLoads() {
@@ -24,4 +31,13 @@ public class DemoApplicationTests {
 		System.out.println(list.size());
 	}
 
+	@Test
+	public void getSysRoleMapper(){
+		// 查询该用户的权限
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("userId", 29);
+		List<SysRole> sysRoleList = sysRoleMapper.selectByUserIdAndRoleId(map);
+		System.out.println(JSONObject.toJSONString(sysRoleList));
+	}
+
 }