完成登录，注册

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

@@ -54,4 +54,27 @@ public class IBuildingOwnerInfoController extends BaseController {
 
     }
 
+    @RequestMapping(value = "/building/has", method = RequestMethod.GET)
+    @ApiOperation(value = "根据 小区、期、楼栋、单元、楼层、户号", notes = "根据 小区、期、楼栋、单元、楼层、户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phase", value = "期"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "building", value = "楼栋"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unit", value = "单元"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "level", value = "楼层"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNo", value = "户号"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    public ResponseBean hasBuilding(@RequestParam(value = "phase", required = false) String phase,
+                                   @RequestParam(value = "building",required = false) String building,
+                                   @RequestParam(value = "unit", required = false) String unit,
+                                   @RequestParam(value = "level", required = false) String level,
+                                   @RequestParam(value = "roomNo", required = false) String roomNo,
+                                   HttpSession session){
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfo.hasBuild(userElement, phase, building, unit, level, roomNo);
+        return responseBean;
+    }
+
 }

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

@@ -43,9 +43,8 @@ public class UserController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName(登陆名(手机号)) code(验证码)")
     })
-    @RequestMapping(value = "/user/login/{communityId}",method = RequestMethod.POST)
+    @RequestMapping(value = "/user/login",method = RequestMethod.POST)
     public ResponseBean login(@RequestBody String parameter,
-                              @PathVariable(value = "communityId") String communityId,
                               HttpSession session){
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),jsonObject.getString("code"));
@@ -249,14 +248,4 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
-    @ApiOperation(value = "查看当前用户所有关联房产",notes = "查看当前用户所有关联房产")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
-    })
-    @RequestMapping(value ="/userhouse" ,method = RequestMethod.GET)
-    public ResponseBean userHouseList(HttpSession session){
-        UserElement userElement= getUserElement(session);
-        ResponseBean responseBean= iTaUserService.userHouseList(userElement);
-        return responseBean;
-    }
 }

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

@@ -9,10 +9,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-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;
 
@@ -30,15 +27,63 @@ public class UserVerifyController extends BaseController {
     private TaUserVerifyServicel taUserVerifyServicel;
 
     @RequestMapping(value = "/user/verify/{userVerifyId}", method = RequestMethod.GET)
-    @ApiOperation(value = "获取当前 一个待审核或审核不通过房产")
+    @ApiOperation(value = "获取当前 一个待审核或审核不通过房产", notes = "获取当前 一个待审核或审核不通过房产")
     @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     public ResponseBean getUserVerify(HttpSession session, @PathVariable("userVerifyId") Integer userVerifyId) {
         UserElement userElement = getUserElement(session);
-        ResponseBean responseBean = taUserVerifyServicel.getList(userElement, userVerifyId);
+        ResponseBean responseBean = taUserVerifyServicel.getToAuditNotApproved(userElement, userVerifyId);
         return responseBean;
     }
 
+    @RequestMapping(value = "/user/verify/add", method = RequestMethod.POST)
+    @ApiOperation(value = "添加一个审核的房产", notes = "添加一个审核的房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "roleName角色名称;phase期;building楼栋;unit单元;level楼层;roomNo户号")
+    })
+    public ResponseBean addUserVerify(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taUserVerifyServicel.addUserVerify(userElement, parameter);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/verify/delete/{userVerifyId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除一个审核的房产", notes = "删除一个审核的房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    public ResponseBean deleteUserVerify(@PathVariable("userVerifyId") Integer userVerifyId, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taUserVerifyServicel.deleteUserVerify(userVerifyId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/current_user/verify/delete/{userVerifyId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除当前用户 关联的房产", notes = "删除当前用户 关联的房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    public ResponseBean deleteCurrentUserVerify(@PathVariable("userVerifyId") Integer userVerifyId, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taUserVerifyServicel.deleteCurrentUserVserify(userElement, userVerifyId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/verify/list", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 当前用户关联的房产", notes = "获取 当前用户关联的房产")
+    public ResponseBean getByCurrentUser(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taUserVerifyServicel.getByCurrentUser(userElement);
+        return responseBean;
+    }
 
 }

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

@@ -3,6 +3,8 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TaSysRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -22,4 +24,13 @@ public interface TaSysRoleMapper {
 
     TaSysRole findRoleByUserId(Integer userId);
 
+    /**
+     * 根据 角色名称 查询
+     * @param roleName
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_sys_role where role_name=#{roleName}")
+    TaSysRole selectByRoleName(String roleName);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingMapper.java

@@ -32,4 +32,5 @@ public interface TpBuildingMapper {
      */
     List<TpBuilding> selectByAddress(Integer communityId,String phase,String building, String unit,String level,String roomNo);
 
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java

@@ -31,8 +31,6 @@ public interface TpBuildingOwnerInfoMapper {
     //根据手机号查询当前信息
     TpBuildingOwnerInfo selectOwnerTel(@Param("ownerTel")String ownerTel);
 
-    @Select("select * from tp_building_owner_info where owner_tel=#{ownerTel}")
-    List<TpBuildingOwnerInfo> sellectHouseList(@Param("ownerTel") String ownerTel);
 
     /**
      * 查询当前房产所在的小区
@@ -53,8 +51,9 @@ public interface TpBuildingOwnerInfoMapper {
     @ResultMap("BaseResultMap")
     @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
             " and phase=#{phase} and building=#{building} and unit=#{unit}" +
-            " and level=#{level} and room_no=#{roomNo}")
+            " and level=#{level} and room_no=#{roomNo} and verify_status=1")
     TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phase") String phase,
                                                     @Param("building") String building, @Param("unit") String unit,
                                                     @Param("level") String level, @Param("roomNo") String roomNo);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUserVerify.java

@@ -42,6 +42,15 @@ public class TaUserVerify {
      */
     private String ownerName;
 
+    /**
+     * 小区名称
+     */
+    private String communityName;
+
+    /**
+     * 小区 省市区
+     */
+    private String communityAddress;
 
     public Integer getId() {
         return id;
@@ -154,4 +163,20 @@ public class TaUserVerify {
     public void setVerifyName(String verifyName) {
         this.verifyName = verifyName;
     }
+
+    public String getCommunityName() {
+        return communityName;
+    }
+
+    public void setCommunityName(String communityName) {
+        this.communityName = communityName;
+    }
+
+    public String getCommunityAddress() {
+        return communityAddress;
+    }
+
+    public void setCommunityAddress(String communityAddress) {
+        this.communityAddress = communityAddress;
+    }
 }

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

@@ -26,7 +26,6 @@ public interface IBuildingOwnerInfo {
 
     /**
      * 根据 小区/期/楼栋/单元/楼层/户号
-     * @param communityId
      * @param phase
      * @param building
      * @param unit
@@ -34,6 +33,6 @@ public interface IBuildingOwnerInfo {
      * @param roomNo
      * @return
      */
-    ResponseBean hasBuild(UserElement userElement,Integer communityId, String phase, String building, String unit, String level, String roomNo);
+    ResponseBean hasBuild(UserElement userElement,String phase, String building, String unit, String level, String roomNo);
 
 }

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

@@ -129,10 +129,4 @@ public interface ITaUserService {
      */
     ResponseBean addWelcomeUser(UserElement userElement,TaUser user);
 
-    /**
-     * 查看当前用户所有关联房产
-     * @param userElement
-     * @return
-     */
-    ResponseBean userHouseList(UserElement userElement);
 }

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

@@ -10,11 +10,41 @@ import com.community.commom.session.UserElement;
 public interface TaUserVerifyServicel {
 
     /**
-     * 查询 app端用户审核表 的数据
+     * 获取当前 一个待审核或审核不通过房产 的数据
      * @param userElement
      * @param userVerifyId
      * @return
      */
-    ResponseBean getList(UserElement userElement, Integer userVerifyId);
+    ResponseBean getToAuditNotApproved(UserElement userElement, Integer userVerifyId);
+
+    /**
+     * 添加 一个审核房产
+     * @param userElement
+     * @param parameter
+     * @return
+     */
+    ResponseBean addUserVerify(UserElement userElement, String parameter);
+
+    /**
+     * 根据id 删除 审核表
+     * @param userVerifyId
+     * @return
+     */
+    ResponseBean deleteUserVerify(Integer userVerifyId);
+
+    /**
+     * 获取 当前用户绑定的房产列表
+     * @param userElement
+     * @return
+     */
+    ResponseBean getByCurrentUser(UserElement userElement);
+
+    /**
+     * 根据房产id  删除当前用户的房产
+     * @param userElement
+     * @param userVerifyId
+     * @return
+     */
+    ResponseBean deleteCurrentUserVserify(UserElement userElement, Integer userVerifyId);
 
 }

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

@@ -32,6 +32,9 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
     @Autowired
     private TpBuildingMapper tpBuildingMapper;
 
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
@@ -45,19 +48,27 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
     }
 
     @Override
-    public ResponseBean hasBuild(UserElement userElement, Integer communityId, String phase, String building, String unit, String level, String roomNo) {
+    public ResponseBean hasBuild(UserElement userElement,  String phase, String building, String unit, String level, String roomNo) {
         ResponseBean responseBean = new ResponseBean();
         // 1.检验该用户关联有没有这个 户号
-        // 2.检验这个户号是否关联了 户主
-        TaUserVerify taUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),communityId, phase, building, unit, level, roomNo);
+        TaUserVerify taUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phase, building, unit, level, roomNo);
         if (null != taUserVerify) {
             responseBean.addError("您已关联此房产，无法再次关联！");
             return responseBean;
         }
 
-        // TODO 查询出这个户号的业主
+        Map<String,Object> result = Maps.newHashMap();
 
+        // 2.检验这个户号是否关联了 户主
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(), phase, building, unit, level, roomNo);
+        if (null != tpBuildingOwnerInfo) {
+            result.put("ownerName",tpBuildingOwnerInfo.getOwnerName());
+            result.put("roleName", "OWNER");
+            responseBean.addSuccess(result);
+            return responseBean;
+        }
 
+        responseBean.addError("该房产，暂无审核通过的业主！");
         return responseBean;
     }
 }

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

@@ -979,12 +979,4 @@ public class TaUserServiceImpl implements ITaUserService {
         return responseBean;
     }
 
-    @Override
-    public ResponseBean userHouseList(UserElement userElement) {
-        ResponseBean response= new ResponseBean();
-        /*根据手机号会查询所有小区的多套房产*/
-        List<TpBuildingOwnerInfo> tpBuildingOwnerInfo  = tpBuildingOwnerInfoMapper.sellectHouseList(userElement.getLoginName());
-        response.addSuccess(tpBuildingOwnerInfo);
-        return response;
-    }
 }

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

@@ -1,20 +1,18 @@
 package com.community.huiju.service.impl;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.dao.TaSysRoleMapper;
-import com.community.huiju.dao.TaUserVerifyMapper;
-import com.community.huiju.dao.ToCommunitiesMapper;
-import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
-import com.community.huiju.model.TaSysRole;
-import com.community.huiju.model.TaUserVerify;
-import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.TaUserVerifyServicel;
+import com.community.huiju.vo.TaUserVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -38,8 +36,14 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
     @Autowired
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
+    @Autowired
+    private TaSysRoleMapper taSysRoleMapper;
+
+    @Autowired
+    private SysNationMapper sysNationMapper;
+
     @Override
-    public ResponseBean getList(UserElement userElement, Integer userVerifyId) {
+    public ResponseBean getToAuditNotApproved(UserElement userElement, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
         TaUserVerify taUserVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
         TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId());
@@ -53,4 +57,100 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         responseBean.addSuccess(taUserVerify);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean addUserVerify(UserElement userElement, String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        TaUserVerify taUserVerify = jsonObject.toJavaObject(TaUserVerify.class);
+
+        // 通过 角色名称 查询出角色的id
+        String roleName = jsonObject.getString("roleName");
+        TaSysRole sysRole = taSysRoleMapper.selectByRoleName(roleName);
+
+        taUserVerify.setRoleId(sysRole.getId());
+        taUserVerify.setCommunityId(userElement.getCommunityId());
+        taUserVerify.setUserId(userElement.getId());
+        taUserVerify.setVerifyStatus("0");
+        taUserVerify.setCreateDate(new Date());
+
+        int rows = taUserVerifyMapper.insertSelective(taUserVerify);
+        if (rows <= 0) {
+            responseBean.addError("操作失败！");
+            return responseBean;
+        }
+
+        responseBean.addSuccess(taUserVerify);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean deleteUserVerify(Integer userVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
+        if ("1".equals(userVerify.getVerifyStatus())) {
+            responseBean.addError("已审核通过的房产，无法删除！");
+            return responseBean;
+        }
+
+        taUserVerifyMapper.deleteByPrimaryKey(userVerifyId);
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getByCurrentUser(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectByUserId(userElement.getId());
+        userVerifyList.forEach(e -> {
+            // 角色
+            TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(e.getRoleId());
+            e.setRoleName(taSysRole.getRoleName());
+            // 小区名称 、省市区
+            setUserVoProperties(e.getCommunityId(), e);
+        });
+
+        responseBean.addSuccess(userVerifyList);
+        return responseBean;
+    }
+
+    /**
+     * 设置 TaUserVO 的一些信息
+     *
+     *      小区，省市区
+     *
+     * @param communityId
+     * @param taUserVerify
+     */
+    private void setUserVoProperties(Integer communityId, TaUserVerify taUserVerify) {
+        // 获取小区
+        ToCommunities toCommunities = toCommunitiesMapper.selectByPrimaryKey(communityId);
+        // 省
+        SysNation province = sysNationMapper.selectByPrimaryKey(toCommunities.getProvinceId());
+        // 市
+        SysNation city = sysNationMapper.selectByPrimaryKey(toCommunities.getCityId());
+        // 区
+        SysNation district = sysNationMapper.selectByPrimaryKey(toCommunities.getDistrictId());
+
+        taUserVerify.setCommunityAddress(province.getProvince()+""+city.getCity()+""+district.getDistrict() + toCommunities.getCommunityName());
+        taUserVerify.setCommunityName(toCommunities.getCommunityName());
+    }
+
+    @Override
+    public ResponseBean deleteCurrentUserVserify(UserElement userElement, Integer userVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
+        if (userElement.getUserVerifyId()  == userVerify.getId()) {
+            responseBean.addError("无法删除当前登录的房产！");
+            return responseBean;
+        }
+
+        taUserVerifyMapper.deleteByPrimaryKey(userVerifyId);
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
 }

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

@@ -191,6 +191,6 @@
     and building = #{building,jdbcType=VARCHAR}
     and unit = #{unit,jdbcType=VARCHAR}
     and level = #{level,jdbcType=VARCHAR}
-    and roomNo = #{room_no,jdbcType=VARCHAR}
+    and room_no = #{roomNo,jdbcType=VARCHAR}
   </select>
 </mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/mode/ResponseBean.java

@@ -47,6 +47,12 @@ public class ResponseBean<T> implements Serializable {
         this.data = data;
     }
 
+    public void addSuccess(String code, String message, T data) {
+        this.code = code;
+        this.message = message;
+        this.data = data;
+    }
+
     public void addSuccess(T data) {
         this.code = "0";
         this.message = "成功";