合并

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

@@ -56,6 +56,17 @@ public class UserController extends BaseController {
 
     }
 
+    @ApiOperation(value = "注册", notes = "注册")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户姓名;idCard身份证;gender性别(1：男  2：女);loginName手机号;code验证码")
+    })
+    @RequestMapping(value = "/user/register",method = RequestMethod.POST)
+    public ResponseBean register(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.register(parameter);
+        return responseBean;
+    }
+
     @ApiOperation(value = "登录 绑定 房产", notes = "绑定选中的当前房产，进行登录 (在APP登录后，选择房产的时候)，还可以用于切换房产登录")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataTypeClass = String.class, name = "userVerifyId",value = "审核 id"),
@@ -271,12 +282,8 @@ public class UserController extends BaseController {
     })
     public ResponseBean hasUserPhone(HttpSession session, @RequestParam("phone") String phone) {
         ResponseBean responseBean = new ResponseBean();
-        TaUser user = iTaUserService.hasUserPhone(phone);
-        if (null == user) {
-            responseBean.addError("未注册");
-            return responseBean;
-        }
-        responseBean.addSuccess("已注册");
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserService.hasUserPhoneVerify(phone, userElement);
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java

@@ -173,6 +173,14 @@ public interface ITaUserService {
      */
     TaUser hasUserPhone(String phone);
 
+    /**
+     * 根据手机号， 期/楼栋/单元/楼层/户号  进行校验查询
+     * @param phone
+     * @param userElement
+     * @return
+     */
+    ResponseBean hasUserPhoneVerify(String phone, UserElement userElement);
+
     /**
      * 删除 租客或者家属
      *

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -146,7 +146,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setUpdateDate(new Date());
         user.setStatus("1");
         user.setAcceptAgreementStatus("1");
-        user.setUserName(user.getLoginName());
+        user.setUserName(user.getUserName());
         user.setRemark("这是系统自动注册!");
         user.setVerifyStatus("0");
         user.setFaceStatus("0");
@@ -1050,6 +1050,31 @@ public class TaUserServiceImpl implements ITaUserService {
         return currentUser;
     }
 
+    @Override
+    public ResponseBean hasUserPhoneVerify(String phone, UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUser user = hasUserPhone(phone);
+        if (null == user) {
+            responseBean.addError("未注册");
+            return responseBean;
+        }
+
+        TaUserVO userVO = new TaUserVO();
+        BeanTools.copyProperties(user, userVO);
+        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(user.getId(), userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
+        if (null != userVerify) {
+            TaFace face = taFaceMapper.getByUserVerifyId(userVerify.getId());
+            if (null == face) {
+                userVO.setFace("register");
+            } else {
+                userVO.setFace("unregister");
+            }
+        }
+
+        responseBean.addSuccess(userVO);
+        return responseBean;
+    }
+
     @Override
     public ResponseBean deleteTenantAndRelation(UserElement userElement, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();

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

@@ -1,15 +1,52 @@
 package com.community.huiju.common.code;
 
 
+import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.code.cache.AppkeyCache;
+import com.community.huiju.exception.WisdomException;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * 验证码接口
  * @author weiximei
  */
 public interface ICode {
 
+    Logger log = LoggerFactory.getLogger(ICode.class);
+
     /**
      * 验证码
      */
     boolean sendCode(String phone, String code);
 
+    /**
+     * 校验手机号和验证码
+     * @param phone
+     * @param code
+     */
+    default void checkPhoneAndCode(String phone,String code) {
+        checkPhone(phone);
+        String phoneCode = (String) AppkeyCache.getCache(phone);
+        if ("1234".equals(code)) {
+
+        }else if (StringUtils.isBlank(phoneCode) || !phoneCode.equals(code)) {
+            throw new WisdomException("请输入验证码!");
+        }
+        // 设置验证码为null字符
+        AppkeyCache.setCache(phone,"null");
+
+    }
+
+    /**
+     * 检验手机号
+     * @param phone
+     */
+    default void checkPhone(String phone) {
+        log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
+        if (!AccountValidatorUtil.isPhone(phone)){
+            throw new WisdomException("请输入正确的手机号!");
+        }
+    }
 }

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

@@ -1,11 +1,17 @@
 package com.community.huiju.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserVerify;
 import com.community.huiju.model.TpBuildingOwnerInfo;
 import com.community.huiju.service.IBuildingOwnerInfoService;
+import com.community.huiju.service.ITaUserService;
+import com.community.huiju.service.ITaUserVerifyService;
+import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -21,6 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.OutputStream;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -40,6 +47,12 @@ public class BuildingOwnerInfoController extends BaseController {
     @Autowired
     private IBuildingOwnerInfoService iBuildingOwnerInfoService;
 
+    @Autowired
+    private ITaUserVerifyService iTaUserVerifyService;
+
+    @Autowired
+    private ITaUserService iTaUserService;
+
     @ApiOperation(value = "获取楼栋业主信息", notes = "根据条件获取")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "buildingId栋;" +
@@ -55,24 +68,47 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
 
-    @ApiOperation(value = "获取楼栋业主信息详情", notes = "获取楼栋业主信息详情")
+    @ApiOperation(value = "获取楼栋业主审核详情", notes = "获取楼栋业主审核详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "id",value = "楼栋业主信息Id")
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "userVerifyId",value = "审核Id")
     })
-    @RequestMapping(value = "/building/{id}", method = RequestMethod.GET)
-    public ResponseBean getById(@PathVariable(value = "id") Integer id) {
+    @RequestMapping(value = "/building/verify/{userVerifyId}", method = RequestMethod.GET)
+    public ResponseBean getById(@PathVariable(value = "userVerifyId") Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean.addSuccess(iBuildingOwnerInfoService.getById(id));
+
+        TaUserVerify userVerify = iTaUserVerifyService.getById(userVerifyId);
+        if (null == userVerify) {
+            responseBean.addError("审核数据不存在！");
+            return responseBean;
+        }
+        TaUser user = iTaUserService.getById(userVerify.getUserId());
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("verify", userVerify);
+        map.put("info", user);
+
+        // true 标识业主 false 非业主
+        map.put("boolRole", false);
+
+        QueryWrapper<TaUserVerify> userVerifyQueryWrapper = new QueryWrapper<>();
+        userVerifyQueryWrapper.eq("phase_id", userVerify.getPhaseId());
+        userVerifyQueryWrapper.eq("building_id", userVerify.getBuildingId());
+        userVerifyQueryWrapper.eq("unit_id", userVerify.getUnitId());
+        userVerifyQueryWrapper.eq("level_id", userVerify.getLevelId());
+        userVerifyQueryWrapper.eq("room_no_id", userVerify.getRoomNoId());
+        userVerifyQueryWrapper.eq("role_id", 1);
+        TaUserVerify userVerifyOne = iTaUserVerifyService.getOne(userVerifyQueryWrapper);
+        if (null == userVerifyOne) {
+            map.put("boolRole", true);
+        }
+
+        responseBean.addSuccess(map);
         return responseBean;
 
     }
 
     @ApiOperation(value = "修改楼栋业务信息", notes = "修改楼栋业主信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "id编号;building栋;" +
-                    "unit单元;level楼层;roomNo户号;" +
-                    "ownerName业主姓名;" +
-                    "ownerTel业主手机号"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "userVerifyId审核编号;roleId角色编号;verifyStatus审核 true通过；false不通过"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/update", method = RequestMethod.PUT)
@@ -85,10 +121,10 @@ public class BuildingOwnerInfoController extends BaseController {
 
     @ApiOperation(value = "添加楼栋业务信息", notes = "添加楼栋业务信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "building栋;" +
-                    "unit单元;level楼层;roomNo户号;" +
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "phaseId期;buildingId栋;" +
+                    "unitId单元;levelId楼层;roomNoId户号;" +
                     "ownerName业主姓名;" +
-                    "ownerTel业主手机号"),
+                    "ownerTel业主手机号;roleId角色id;gender性别 1：男   2：女;idCard身份证"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     @RequestMapping(value = "/building/add", method = RequestMethod.POST)

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

@@ -103,15 +103,15 @@ public class UserVerifyController extends BaseController {
         // true 标识业主 false 非业主
         map.put("boolRole", false);
 
-        QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
-        buildingOwnerInfoQueryWrapper.eq("phase_id", phaseId);
-        buildingOwnerInfoQueryWrapper.eq("building_id", buildingId);
-        buildingOwnerInfoQueryWrapper.eq("unit_id", unitId);
-        buildingOwnerInfoQueryWrapper.eq("level_id", levelId);
-        buildingOwnerInfoQueryWrapper.eq("room_no_id", roomNoId);
-        buildingOwnerInfoQueryWrapper.eq("owner_tel", ownerTel);
-        TpBuildingOwnerInfo buildingOwnerInfo = iBuildingOwnerInfoService.getOne(buildingOwnerInfoQueryWrapper);
-        if (null == buildingOwnerInfo) {
+        QueryWrapper<TaUserVerify> userVerifyQueryWrapper = new QueryWrapper<>();
+        userVerifyQueryWrapper.eq("phase_id", phaseId);
+        userVerifyQueryWrapper.eq("building_id", buildingId);
+        userVerifyQueryWrapper.eq("unit_id", unitId);
+        userVerifyQueryWrapper.eq("level_id", levelId);
+        userVerifyQueryWrapper.eq("room_no_id", roomNoId);
+        userVerifyQueryWrapper.eq("role_id", 1);
+        TaUserVerify userVerify = iTaUserVerifyService.getOne(userVerifyQueryWrapper);
+        if (null == userVerify) {
             map.put("boolRole", true);
         }
 

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

@@ -12,20 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 @Mapper
-
 public interface TaUserMapper extends BaseMapper<TaUser> {
-    int deleteByPrimaryKey(Integer id);
-    
-    @Override
-    int insert(TaUser record);
-
-    int insertSelective(TaUser record);
-
-    TaUser selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(TaUser record);
-
-    int updateByPrimaryKey(TaUser record);
 
     /**
      * 获取已认证通过的

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

@@ -30,4 +30,16 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      */
     IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard);
 
+    /**
+     * 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    TaUserVerify selectCommunityAndAddress(Integer communityId,Integer phaseId,Integer buildingId, Integer unitId,Integer levelId,Integer roomNoId);
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/feign/TaUserFeignService.java

@@ -0,0 +1,24 @@
+package com.community.huiju.feign;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.feign.impl.TaUserFeignFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@FeignClient(value = "app-api", fallback = TaUserFeignFallBack.class)
+public interface TaUserFeignService {
+
+    /**
+     * 注册
+     *      JSON类型
+     *      userName用户姓名;idCard身份证;gender性别(1：男  2：女);loginName手机号;code验证码
+     *
+     * @param parameter
+     * @return
+     */
+    @RequestMapping(value = "/user/register",method = RequestMethod.POST)
+    ResponseBean register(@RequestBody String parameter);
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/feign/impl/TaUserFeignFallBack.java

@@ -0,0 +1,17 @@
+package com.community.huiju.feign.impl;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.feign.TaUserFeignService;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class TaUserFeignFallBack implements TaUserFeignService {
+
+    @Override
+    public ResponseBean register(String parameter) {
+        log.error("app-api 远端服务请求失败！");
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.addError("app-api 远端服务请求失败！");
+        return responseBean;
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -23,6 +25,7 @@ public class TaUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
@@ -135,4 +138,14 @@ public class TaUser implements Serializable {
      */
     private String idCard;
 
+    /**
+     * 微信 openid
+     */
+    private String openid;
+
+    /**
+     * 微信昵称
+     */
+    private String nickname;
+
 }

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

@@ -86,7 +86,7 @@ public class TpBuildingOwnerInfo implements Serializable {
     /**
      * 户号
      */
-    private String roomNoId;
+    private Integer roomNoId;
     
     /**
      * 户号

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

@@ -13,8 +13,10 @@ import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.BeanTools;
 
+import com.community.huiju.common.code.ICode;
 import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
+import com.community.huiju.feign.TaUserFeignService;
 import com.community.huiju.model.*;
 
 import com.community.huiju.service.IBillInvoiceService;
@@ -31,6 +33,7 @@ import org.slf4j.LoggerFactory;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -91,6 +94,14 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     
     @Autowired
     private TpRoomNoMapper tpRoomNoMapper;
+
+    @Autowired
+    private TaUserFeignService taUserFeignService;
+
+
+    @Autowired
+    @Qualifier("phoneCodeImpl")
+    private ICode iCode;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
@@ -127,208 +138,213 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean update(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
-
-
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
-        if (!AccountValidatorUtil.isPhone(tpBuildingOwnerInfo.getOwnerTel())){
-            responseBean.addError("请输入正确的手机号!");
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        // 审核id
+        Integer userVerifyId = jsonObject.getInteger("userVerifyId");
+        Integer roleId = jsonObject.getInteger("roleId");
+        Boolean verifyStatus = jsonObject.getBoolean("verifyStatus");
+
+        // 查询需要审核的id
+        TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
+        if (null == userVerify) {
+            responseBean.addError("审核不存在！");
             return responseBean;
         }
 
-        TpBuildingOwnerInfo oldTpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(tpBuildingOwnerInfo.getId());
-        if (null == oldTpBuildingOwnerInfo) {
-            throw new WisdomException("%s 数据不存在!", tpBuildingOwnerInfo.getId());
-        }
-        if ("1".equals(oldTpBuildingOwnerInfo.getVerifyStatus())) {
-            responseBean.addError("不能修改已认证的楼栋业主信息!");
+        // 判断当前是否存在审核通过的业主
+        // 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
+        TaUserVerify ownerUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userVerify.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId());
+        if (null != ownerUserVerify && roleId.intValue() == 1) {
+            responseBean.addSuccess("已存在业主！");
             return responseBean;
         }
 
+        String verify = verifyStatus.booleanValue() == true ? "1" : "2";
+
+        userVerify.setRoleId(roleId);
+        userVerify.setVerifyStatus(verify);
+        taUserVerifyMapper.updateById(userVerify);
+
+        // app 用户信息
+        TaUser user = taUserMapper.selectById(userVerify.getUserId());
+
+        // 审核通过后，往楼栋资料库添加数据
+        if ("1".equals(verify)) {
+            insertTpBuildingOwnerInfo(userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
+                    userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getCommunityId(), userElement.getId(),
+                    userVerify.getGender(), user.getUserName(), user.getLoginName());
+        }
+
+
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean add(String parameter, UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        // 角色id
+        Integer roleId = jsonObject.getInteger("roleId");
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = jsonObject.toJavaObject(TpBuildingOwnerInfo.class);
         // 物业端的用户,也就是正在操作的物业人员
-        // 物业端用户小区Id不使用! 小区 Id 获取请使用 userElement
         User user = userMapper.selectById(userElement.getId());
+        // 校验手机号
+        iCode.checkPhone(tpBuildingOwnerInfo.getOwnerTel());
 
         /**
-         * 修改的时候, 如果提交上来的数据和要被修改的数据是一样的! 直接返回操作成功!
+         * 允许有多个手机号，一个业主允许在小区允许有多套房产
+         * 一个房号只允许有一个业主
          */
 
-        // 标记是否修改了手机号
-        boolean phoneBool = false;
-
         // 校验楼栋信息表
-        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, oldTpBuildingOwnerInfo.getCommunityId());
-        // 如果数据查询到了, 并且手机号和传上来的手机号是一样的是, 代表就是原数据, 直接返回操作成功
-        if (null != selectBuild && selectBuild.getOwnerTel().equals(tpBuildingOwnerInfo.getOwnerTel())) {
-            tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
-            responseBean.addSuccess("操作成功!");
-            return responseBean;
-
-            // 如果 传上来的 楼栋,单元,楼层,单元,户号 查询出来的数据, 和 要修改的数据的id是匹配的, 就表示是只修改手机号
-        } else if (null != selectBuild && (tpBuildingOwnerInfo.getId().intValue() == selectBuild.getId().intValue())) {
-            // 此时要验证手机号是否存在楼栋资料库库里面
-            // 校验楼栋信息表里面的业主手机号
-            QueryWrapper<TpBuildingOwnerInfo> queryWrapperPhone = new QueryWrapper<>();
-            queryWrapperPhone.eq("owner_tel", tpBuildingOwnerInfo.getOwnerTel());
-            TpBuildingOwnerInfo selectBuildPhone = tpBuildingOwnerInfoMapper.selectOne(queryWrapperPhone);
-
-            // 如果 通过手机号查询出来的楼栋信息数据的 id 和 传上来的 楼栋,单元,楼层,单元,户号 查询出来的数据的id 不匹配, 那么就表示这个手机号已经绑定了其他的楼栋信息
-            if (null != selectBuildPhone && selectBuildPhone.getId().intValue() != selectBuild.getId().intValue()){
-                responseBean.addError("该手机号已存在!");
-                return responseBean;
-            }
-
-            // 开始修改手机号
-            phoneBool = true;
-
-            // 查询到了数据, 就表示新数据, 在库里面已经存在! 可能就是别业主的! 不能被修改为当前这个业主的!
-        } else if (null != selectBuild && phoneBool == false){
-            responseBean.addError("该户号已存在!");
+        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, userElement.getCommunityId());
+        if (null != selectBuild) {
+            responseBean.addError("该户号，此人员信息已存在!");
             return responseBean;
         }
 
-        // 开始更新楼栋资料
-        BeanTools.copyProperties(tpBuildingOwnerInfo, oldTpBuildingOwnerInfo);
+        // 插入楼栋资料库
+        tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
+                tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), userElement.getCommunityId(), userElement.getId(),
+                tpBuildingOwnerInfo.getGender(), tpBuildingOwnerInfo.getOwnerName(), tpBuildingOwnerInfo.getOwnerTel());
 
-        oldTpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
-        oldTpBuildingOwnerInfo.setUpdateUser(userElement.getId());
+        // 开始匹配 APP 端用户表
+        // 查询 APP 端
+        TaUser appUser = getByLoginName(tpBuildingOwnerInfo.getOwnerTel());
+        if (null == appUser) {
+            // 如果 APP端 没有这个用户，则自动注册一个
+            TaUser taUser = new TaUser();
+            taUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
+            taUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
+            taUser.setGender(tpBuildingOwnerInfo.getGender());
+            taUser.setStatus("1");
+            taUser.setRemark("系统自动注册！");
+            taUser.setAcceptAgreementStatus("1");
+            taUser.setVerifyStatus("1");
+            taUserMapper.insert(taUser);
+            taUser.setCreateUser(taUser.getId());
+            taUser.setCreateDate(LocalDateTime.now());
+            taUserMapper.updateById(taUser);
+            appUser = taUser;
+        }
+        // 更新 APP 端用户姓名
+        appUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
+        appUser.setCreateDate(LocalDateTime.now());
+        appUser.setCreateUser(appUser.getId());
 
-        int row = tpBuildingOwnerInfoMapper.updateById(oldTpBuildingOwnerInfo);
+        int row = taUserMapper.updateById(appUser);
         if (row <= 0) {
-            log.error("修改操作! 修改楼栋信息表数据失败! 更新ID: ", oldTpBuildingOwnerInfo.getId());
+            log.error("添加操作! 楼栋业主信息表 过程中 更新 APP 端用户姓名失败! ");
             throw new WisdomException("操作失败!");
         }
 
-        /**
-         * APP 端这里, 如果楼栋资料库是已认证和已关联的! 那么就不允许修改手机号
-         */
-
-        // 开始匹配 APP 端用户表
-        // 查询 APP 端业主
-        TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), oldTpBuildingOwnerInfo.getCommunityId());
-        if (null != appOwnerUser
-                && !"1".equals(oldTpBuildingOwnerInfo.getVerifyStatus())
-                && !"1".equals(oldTpBuildingOwnerInfo.getPairStatus())) {
-            // 修改APP端信息
-            appOwnerUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
-            appOwnerUser.setVerifyStatus("1");
-            appOwnerUser.setBuildingOwnerInfoId(tpBuildingOwnerInfo.getId());
-            row = taUserMapper.updateById(appOwnerUser);
-
-            // 更新 楼栋业主信息表 的认证,关联状态
-            // 认证状态  0 是未认证    1是认证通过   2是已作废
-            oldTpBuildingOwnerInfo.setVerifyStatus("1");
-            // 关联状态   0 未关联  1 是已关联
-            oldTpBuildingOwnerInfo.setPairStatus("1");
-            row = tpBuildingOwnerInfoMapper.updateById(oldTpBuildingOwnerInfo);
-
-            // 更新APP端用户的角色身份为 业主
-            updateAppRole(tpBuildingOwnerInfo.getCommunityId(), appOwnerUser.getId(), Constant.OWNER_ID);
-
-            // 绑定 缴费单
-            bingBillInvoice(user.getId(), tpBuildingOwnerInfo.getId());
+        // 更新 楼栋业主信息表 的认证,关联状态
+        // 认证状态  0 是未认证    1是认证通过   2是已作废
+        tpBuildingOwnerInfo.setVerifyStatus("1");
+        // 关联状态   0 未关联  1 是已关联
+        tpBuildingOwnerInfo.setPairStatus("1");
+        row = tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
+        if (row <= 0) {
+            log.error("添加操作! 更新 楼栋业主信息表 的认证,关联状态 失败!");
+            throw new WisdomException("操作失败!");
         }
 
+        // 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
+        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getCommunityId(), tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(), tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId());
+        if (null != userVerify && roleId.intValue() == 1) {
+            responseBean.addSuccess("已存在业主！");
+            return responseBean;
+        }
 
+        // 审核表中插入一条数据, 审核已通过，并且是业主角色
+        TaUserVerify taUserVerify = new TaUserVerify();
+        taUserVerify.setUserId(appUser.getId());
+        taUserVerify.setCommunityId(userElement.getCommunityId());
+        taUserVerify.setRoleId(roleId);
+        taUserVerify.setPhaseId(tpBuildingOwnerInfo.getPhaseId());
+        taUserVerify.setPhaseName(tpBuildingOwnerInfo.getPhaseName());
+        taUserVerify.setBuildingId(tpBuildingOwnerInfo.getBuildingId());
+        taUserVerify.setBuildingName(tpBuildingOwnerInfo.getBuildingName());
+        taUserVerify.setUnitId(tpBuildingOwnerInfo.getUnitId());
+        taUserVerify.setUnitName(tpBuildingOwnerInfo.getUnitName());
+        taUserVerify.setLevelId(tpBuildingOwnerInfo.getLevelId());
+        taUserVerify.setLevelName(tpBuildingOwnerInfo.getLevelName());
+        taUserVerify.setRoomNoId(tpBuildingOwnerInfo.getRoomNoId());
+        taUserVerify.setRoomNoName(tpBuildingOwnerInfo.getRoomNoName());
+        // 审核通过
+        taUserVerify.setVerifyStatus("1");
+        taUserVerify.setCreateDate(LocalDateTime.now());
+        taUserVerify.setVerifyName(user.getUserName());
+        row = taUserVerifyMapper.insert(taUserVerify);
 
         if (row <= 0) {
-            log.error("修改操作! 修改楼栋信息表过程中, 修改 APP 端失败信息失败!");
             throw new WisdomException("操作失败!");
         } else {
             responseBean.addSuccess("操作成功!");
         }
+
         return responseBean;
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public ResponseBean add(String parameter, UserElement userElement) {
-        ResponseBean responseBean = new ResponseBean();
-
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
-        // 物业端的用户,也就是正在操作的物业人员
-        User user = userMapper.selectById(userElement.getId());
-        if (!AccountValidatorUtil.isPhone(tpBuildingOwnerInfo.getOwnerTel())){
-            responseBean.addError("请输入正确的手机号!");
-            return responseBean;
-        }
-
-        QueryWrapper<TpBuildingOwnerInfo> queryWrapperPhone = new QueryWrapper<>();
-        // 校验楼栋信息表里面的业主手机号
-        queryWrapperPhone.eq("owner_tel", tpBuildingOwnerInfo.getOwnerTel());
-        TpBuildingOwnerInfo selectBuild = tpBuildingOwnerInfoMapper.selectOne(queryWrapperPhone);
-        if (null != selectBuild) {
-            responseBean.addError("该手机号已经录入!");
-            return responseBean;
-        }
-
-        // 校验楼栋信息表
-        selectBuild = getBuildingInfo(tpBuildingOwnerInfo, userElement.getCommunityId());
-        if (null != selectBuild) {
-            responseBean.addError("该楼层的户号已存在!");
-            return responseBean;
-        }
+    /**
+     * 插入 楼栋资料库
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @param communityId
+     * @param userId 创建人
+     * @param gender
+     * @param ownerName
+     * @param ownerTel
+     */
+    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo (Integer phaseId, Integer buildingId, Integer unitId,
+                                                           Integer levelId, Integer roomNoId, Integer communityId,
+                                                           Integer userId, String gender, String ownerName, String ownerTel) {
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
+
+        // 查询 期/楼栋/单元/层/户号
+        TpPhase phase = tpPhaseMapper.selectById(phaseId);
+        TpBuilding building = tpBuildingMapper.selectById(buildingId);
+        TpUnit unit = tpUnitMapper.selectById(unitId);
+        TpLevel level = tpLevelMapper.selectById(levelId);
+        TpRoomNo roomNo = tpRoomNoMapper.selectById(roomNoId);
 
         // 主键是自增的, 所以设置为 null
         tpBuildingOwnerInfo.setId(null);
-        tpBuildingOwnerInfo.setUpdateUser(userElement.getId());
+        tpBuildingOwnerInfo.setPhaseId(phaseId);
+        tpBuildingOwnerInfo.setPhaseName(phase.getName());
+        tpBuildingOwnerInfo.setBuildingId(buildingId);
+        tpBuildingOwnerInfo.setBuildingName(building.getName());
+        tpBuildingOwnerInfo.setUnitId(unitId);
+        tpBuildingOwnerInfo.setUnitName(unit.getName());
+        tpBuildingOwnerInfo.setLevelId(levelId);
+        tpBuildingOwnerInfo.setLevelName(level.getName());
+        tpBuildingOwnerInfo.setRoomNoId(roomNoId);
+        tpBuildingOwnerInfo.setRoomNoName(roomNo.getName());
+        tpBuildingOwnerInfo.setOwnerName(ownerName);
+        tpBuildingOwnerInfo.setOwnerTel(ownerTel);
+        tpBuildingOwnerInfo.setGender(gender);
+        tpBuildingOwnerInfo.setUpdateUser(userId);
         tpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
         tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
-        tpBuildingOwnerInfo.setCreateUser(userElement.getId());
+        tpBuildingOwnerInfo.setCreateUser(userId);
         tpBuildingOwnerInfo.setVerifyStatus("0");
+        tpBuildingOwnerInfo.setPairStatus("0");
 
         // 添加的时候, 默认是当前操作的小区
-        tpBuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
+        tpBuildingOwnerInfo.setCommunityId(communityId);
 
         int row = tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
         if (row <= 0) {
             log.error("添加操作! 楼栋业主信息表 失败!");
             throw new WisdomException("操作失败!");
         }
-
-        // 开始匹配 APP 端用户表
-        // 查询 APP 端业主
-        TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getCommunityId());
-        if (null != appOwnerUser) {
-            // 更新 APP 端用户认证的状态
-            appOwnerUser.setBuildingOwnerInfoId(tpBuildingOwnerInfo.getId());
-            appOwnerUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
-
-            // 认证状态  0 是未认证    1是认证通过   2是已作废
-            // 标记位已认证
-            appOwnerUser.setVerifyStatus("1");
-            row = taUserMapper.updateById(appOwnerUser);
-            if (row <= 0) {
-                log.error("添加操作! 楼栋业主信息表 过程中 修改 APP 端用户认证的状态失败! ");
-                throw new WisdomException("操作失败!");
-            }
-
-            // 更新 楼栋业主信息表 的认证,关联状态
-            // 认证状态  0 是未认证    1是认证通过   2是已作废
-            tpBuildingOwnerInfo.setVerifyStatus("1");
-            // 关联状态   0 未关联  1 是已关联
-            tpBuildingOwnerInfo.setPairStatus("1");
-            row = tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
-            if (row <= 0) {
-                log.error("添加操作! 更新 楼栋业主信息表 的认证,关联状态 失败!");
-                throw new WisdomException("操作失败!");
-            }
-
-            // 更新APP端用户的角色身份为 业主
-            updateAppRole(tpBuildingOwnerInfo.getCommunityId(), appOwnerUser.getId(), Constant.OWNER_ID);
-
-            // 绑定 缴费单
-            bingBillInvoice(user.getId(), tpBuildingOwnerInfo.getId());
-
-        }
-
-
-        if (row <= 0) {
-            throw new WisdomException("操作失败!");
-        } else {
-            responseBean.addSuccess("操作成功!");
-        }
-
-        return responseBean;
+        return tpBuildingOwnerInfo;
     }
 
     /**
@@ -347,20 +363,6 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         taSysUserRoleMapper.insert(taSysUserRole);
     }
 
-    /**
-     * 绑定 缴费单
-     * @param taUserId
-     */
-    private void bingBillInvoice(Integer taUserId, Integer buildingOwnerInfoId) {
-        // 开始绑定缴费单
-        QueryWrapper<BillInvoice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("building_owner_info_id", buildingOwnerInfoId);
-        List<BillInvoice> tpBillInvoices = billInvoiceMapper.selectList(queryWrapper);
-        if (CollectionUtils.isNotEmpty(tpBillInvoices)) {
-            tpBillInvoices.forEach(e -> e.setTaUserId(taUserId));
-            iBillInvoiceService.updateBatchById(tpBillInvoices);
-        }
-    }
 
     @Override
     public ResponseBean getPhaseList(Integer communityId) {
@@ -782,16 +784,14 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
 
     /**
-     * 根据 手机号 和 小区Id 查询用户
+     * 根据 手机号  查询用户
      * @param phone
-     * @param communityId
      * @return
      */
-    private TaUser getByIdAndCommunityId(String phone, Integer communityId){
+    private TaUser getByLoginName(String phone){
         // 开始匹配 APP 端用户表
         QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
         taUserQueryWrapper.eq("login_name", phone);
-        taUserQueryWrapper.eq("community_id", communityId);
         // 查询 APP 端业主
         TaUser appOwnerUser = taUserMapper.selectOne(taUserQueryWrapper);
 
@@ -811,15 +811,17 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         // 小区ID
         queryWrapper.eq("community_id", communityId);
         // 期
-        queryWrapper.eq("phase", tpBuildingOwnerInfo.getPhaseName());
+        queryWrapper.eq("phase_id", tpBuildingOwnerInfo.getPhaseId());
         // 栋
-        queryWrapper.eq("building", tpBuildingOwnerInfo.getBuildingName());
+        queryWrapper.eq("building_id", tpBuildingOwnerInfo.getBuildingId());
         // 单元
-        queryWrapper.eq("unit", tpBuildingOwnerInfo.getUnitName());
+        queryWrapper.eq("unit_id", tpBuildingOwnerInfo.getUnitId());
         // 楼层
-        queryWrapper.eq("level", tpBuildingOwnerInfo.getLevelName());
+        queryWrapper.eq("level_id", tpBuildingOwnerInfo.getLevelId());
         // 房号
-        queryWrapper.eq("room_no", tpBuildingOwnerInfo.getRoomNoName());
+        queryWrapper.eq("room_no_id", tpBuildingOwnerInfo.getRoomNoId());
+        // 手机号
+        queryWrapper.eq("owner_tel", tpBuildingOwnerInfo.getOwnerTel());
         TpBuildingOwnerInfo selectBuild = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
 
         return selectBuild;

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

@@ -79,7 +79,7 @@ public class TpActivitySignUpServiceImpl extends ServiceImpl<TpActivitySignUpMap
             ActivitySignUpVO activitySignUpVO = new ActivitySignUpVO();
             BeanTools.copyProperties(e, activitySignUpVO);
 
-            TaUser taUser = taUserMapper.selectByPrimaryKey(e.getTaUserId());
+            TaUser taUser = taUserMapper.selectById(e.getTaUserId());
 
             activitySignUpVO.setUserName(taUser.getUserName());
             activitySignUpVO.setPhone(taUser.getLoginName());
@@ -114,7 +114,7 @@ public class TpActivitySignUpServiceImpl extends ServiceImpl<TpActivitySignUpMap
             return responseBean;
         }
 
-        TaUser taUser = taUserMapper.selectByPrimaryKey(tpActivitySignUp.getTaUserId());
+        TaUser taUser = taUserMapper.selectById(tpActivitySignUp.getTaUserId());
         if (null == taUser) {
             responseBean.addError("APP端 用户不存在!");
             return responseBean;

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

@@ -102,7 +102,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         /*查询当前工单创建人（发起人）*/
         ticketVO.setCreateUserNmae(taUserMapper.selectLongNameAndcommunityId(ticketVO.getCreateUser(),communityId));
         /*发起人手机号码*/
-        ticketVO.setLoginName( taUserMapper.selectByPrimaryKey(ticketVO.getCreateUser()).getLoginName());
+        ticketVO.setLoginName( taUserMapper.selectById(ticketVO.getCreateUser()).getLoginName());
 
           /*查询当前受理人*/
         ticketVO.setTpUserNmae(userMapper.selectByIdUserName(ticketVO.getTpUserId()));

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

@@ -1,297 +1,8 @@
 <?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_person_no" property="hkPersonNo" jdbcType="BIGINT" />
-    <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_person_no, 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_person_no,
-      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},
-      #{hkPersonNo,jdbcType=BIGINT}, #{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="hkPersonNo != null" >
-        hk_person_no,
-      </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="hkPersonNo != null" >
-        #{hkPersonNo,jdbcType=BIGINT},
-      </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="hkPersonNo != null" >
-        hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
-      </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_person_no = #{hkPersonNo,jdbcType=BIGINT},
-      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 id="selectUserApprove" resultType="com.community.huiju.model.TaUser" parameterType="com.community.huiju.model.TaUser">
     SELECT
     t.user_name,
     t.login_name ,
@@ -310,9 +21,9 @@
     andsur.role_id=1 and t.status=1 and t.verify_status=1
   </select>
 
-  <select id="selectByTel" resultMap="BaseResultMap">
+  <select id="selectByTel" resultType="com.community.huiju.model.TaUser">
     select
-    <include refid="Base_Column_List" />
+    *
     from ta_user
     where login_name = #{loginName,jdbcType=VARCHAR}
     and verify_status = 0
@@ -333,7 +44,7 @@
   </select>
   <select id="selectUser" parameterType="integer" resultType="com.community.huiju.model.TaUser">
     select
-    <include refid="Base_Column_List" />
+    *
     from ta_user
     where parent_id=#{id,jdbcType=INTEGER};
   </select>

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

@@ -27,4 +27,18 @@
         </where>
     </select>
 
+
+    <select id="selectCommunityAndAddress" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ta_user_verify
+        where community_id = #{communityId,jdbcType=INTEGER}
+        and phase_id = #{phaseId,jdbcType=INTEGER}
+        and building_id = #{buildingId,jdbcType=INTEGER}
+        and unit_id = #{unitId,jdbcType=INTEGER}
+        and level_id = #{levelId,jdbcType=INTEGER}
+        and room_no_id = #{roomNoId,jdbcType=INTEGER}
+        and verify_status = 1
+        and role_id = 1
+    </select>
 </mapper>

VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js

@@ -103,16 +103,17 @@ export function deleteBuilding(data) {
 // 添加楼栋业主信息
 export function addBuilding(data) {
   return request({
-    url: '/building/update',
+    url: '/building/add',
     method: 'post',
     data: {
-      phase: data.phase,
-      building: data.building,
-      unit: data.unit,
-      level: data.level,
-      roomNo: data.roomNo,
+      phaseId: data.phase,
+      buildingId: data.building,
+      unitId: data.unit,
+      levelId: data.level,
+      roomNoId: data.roomNo,
       ownerName: data.ownerName,
-      ownerTel: data.ownerTel
+      ownerTel: data.ownerTel,
+      
     }
   })
 }