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

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

     private IBuildingOwnerInfo iBuildingOwnerInfo;
 
     @RequestMapping(value = "/building/select/address", method = RequestMethod.GET)
-    @ApiOperation(value = "根据 小区/期/楼栋/单元/楼层/户号", notes = "根据 小区/期/楼栋/单元/楼层/户号")
+    @ApiOperation(value = "根据 小区/期/楼栋/单元/楼层/户号 (申请注册绑定)", notes = "根据 小区/期/楼栋/单元/楼层/户号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unitId", value = "单元"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNoId", value = "户号"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层")
     })
     public ResponseBean selectByAddress(@RequestParam("communityId") Integer communityId,
                                         @RequestParam(value = "phaseId", required = false) Integer phaseId,
                                         @RequestParam(value = "buildingId",required = false) Integer buildingId,
                                         @RequestParam(value = "unitId", required = false) Integer unitId,
-                                        @RequestParam(value = "levelId", required = false) Integer levelId,
-                                        @RequestParam(value = "roomNoId", required = false) Integer roomNoId) {
+                                        @RequestParam(value = "levelId", required = false) Integer levelId) {
 
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfo.selectBuildList(communityId, phaseId, buildingId, unitId, levelId, roomNoId);
+        responseBean = iBuildingOwnerInfo.selectBuildList(communityId, phaseId, buildingId, unitId, levelId);
         return responseBean;
 
     }
 
     @RequestMapping(value = "/building/has", method = RequestMethod.GET)
-    @ApiOperation(value = "根据 小区、期、楼栋、单元、楼层、户号", notes = "根据 小区、期、楼栋、单元、楼层、户号")
+    @ApiOperation(value = "根据 小区、期、楼栋、单元、楼层、户号 （并校验这个用户，是否绑定了这个房产）", notes = "根据 小区、期、楼栋、单元、楼层、户号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),

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

     @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户号")
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
     })
     public ResponseBean addUserVerify(@RequestBody String parameter, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();

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

 
 import com.community.huiju.model.TpBuilding;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
 
     int updateByPrimaryKey(TpBuilding record);
 
-
+    /**
+     * 根据小区id，期id
+     * @param communityId
+     * @param phaseId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building where community_id=#{communityId} and phase_id=#{phaseId}")
+    List<TpBuilding> selectByAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId);
 
 }

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

     @ResultMap("BaseResultMap")
     @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
             " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
-            " and level_id=#{levelId} and room_no_id=#{roomNoId} and verify_status=1")
+            " and level_id=#{levelId} and id=#{roomNoId} and verify_status=1")
     TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId,
                                                     @Param("buildingId") Integer building, @Param("unitId") Integer unitId,
                                                     @Param("levelId") Integer level, @Param("roomNoId") Integer roomNoId);
 
+    /*
+     * 根据 小区，期，楼栋，单元，楼层
+     * @param communityId
+     * @param phase
+     * @param building
+     * @param unit
+     * @param level
+     * @param roomNo
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
+            " and level_id=#{levelId} and verify_status=1")
+    List<TpBuildingOwnerInfo> selectByAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId,
+                                                    @Param("buildingId") Integer building, @Param("unitId") Integer unitId,
+                                                    @Param("levelId") Integer level);
 }

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

 
 import com.community.huiju.model.TpLevel;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface TpLevelMapper {
     int updateByPrimaryKeySelective(TpLevel record);
 
     int updateByPrimaryKey(TpLevel record);
+
+    /**
+     * 根据 小区id，期id，楼栋id，单元id 进行查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_level where community_id=#{communityId} and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}")
+    List<TpLevel> selectByAddress(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId);
 }

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

 
 import com.community.huiju.model.TpPhase;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface TpPhaseMapper {
     int updateByPrimaryKeySelective(TpPhase record);
 
     int updateByPrimaryKey(TpPhase record);
+
+    /**
+     * 根据小区查询 期
+     * @param communityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_phase where community_id = #{communityId}")
+    List<TpPhase> selectByAddress(@Param("communityId") Integer communityId);
 }

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

 
 import com.community.huiju.model.TpUnit;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface TpUnitMapper {
     int updateByPrimaryKeySelective(TpUnit record);
 
     int updateByPrimaryKey(TpUnit record);
+
+    /**
+     * 根据 小区id，期id，楼栋id 查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_unit where community_id=#{communityId} and phase_id=#{phaseId} and building_id=#{buildingId}")
+    List<TpUnit> selectByAddress(Integer communityId, Integer phaseId, Integer buildingId);
 }

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

      * @param buildingId
      * @param unitId
      * @param levelId
-     * @param roomNoId
      * @return
      */
-    ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
+    ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
 
     /**
      * 根据 小区/期/楼栋/单元/楼层/户号
+     * 并校验这个用户，是否绑定了这个房产
      * @param phaseId
      * @param buildingId
      * @param unitId

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

 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.dao.TaUserVerifyMapper;
-import com.community.huiju.dao.TpBuildingMapper;
-import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
-import com.community.huiju.model.TaUserVerify;
-import com.community.huiju.model.TpBuilding;
-import com.community.huiju.model.TpBuildingOwnerInfo;
-import com.community.huiju.model.TpTransaction;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.IBuildingOwnerInfo;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 @Service
 public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
 
+    /**
+     * 栋
+     */
     @Autowired
     private TpBuildingMapper tpBuildingMapper;
 
+    /**
+     * 户号 /  楼栋资料库
+     */
     @Autowired
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+    /**
+     * 期
+     */
+    @Autowired
+    private TpPhaseMapper tpPhaseMapper;
+
+    /**
+     * 单元
+     */
+    @Autowired
+    private TpUnitMapper tpUnitMapper;
+
+    /**
+     * 楼层
+     */
+    @Autowired
+    private TpLevelMapper tpLevelMapper;
+
+
     @Override
-    public ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
+    public ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId) {
         ResponseBean responseBean = new ResponseBean();
 
+        // 查询 期 -> 栋 -> 单元 -> 楼层 -> 户号
+        if (null == phaseId && null == buildingId && null == unitId && null == levelId) {
+            List<TpPhase> phaseList = tpPhaseMapper.selectByAddress(communityId);
+            responseBean.addSuccess(phaseList);
+        } else if (null == buildingId && null == unitId && null == levelId) {
+            List<TpBuilding> buildingList = tpBuildingMapper.selectByAddress(communityId, phaseId);
+            responseBean.addSuccess(buildingList);
+        } else if (null == unitId && null == levelId) {
+            List<TpUnit> unitList = tpUnitMapper.selectByAddress(communityId, phaseId, buildingId);
+            responseBean.addSuccess(unitList);
+        } else if (null == levelId) {
+            List<TpLevel> levelList = tpLevelMapper.selectByAddress(communityId, phaseId, buildingId, unitId);
+            responseBean.addSuccess(levelList);
+        } else {
+            List<TpBuildingOwnerInfo> buildingOwnerInfoList = tpBuildingOwnerInfoMapper.selectByAddress(communityId, phaseId, buildingId, unitId, levelId);
+            responseBean.addSuccess(buildingOwnerInfoList);
+        }
 
-
-        responseBean.addSuccess(null);
         return responseBean;
     }
 

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

     @Autowired
     private TaSysRoleMapper taSysRoleMapper;
 
-    @Autowired
-    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
-
     @Autowired
     private SysNationMapper sysNationMapper;
 
     @Autowired
     private TaUserMapper taUserMapper;
 
+    /**
+     * 期
+     */
+    @Autowired
+    private TpPhaseMapper tpPhaseMapper;
+
+    /**
+     * 单元
+     */
+    @Autowired
+    private TpUnitMapper tpUnitMapper;
+
+    /**
+     * 楼层
+     */
+    @Autowired
+    private TpLevelMapper tpLevelMapper;
+
+    /**
+     * 栋
+     */
+    @Autowired
+    private TpBuildingMapper tpBuildingMapper;
+
+    /**
+     * 户号 /  楼栋资料库
+     */
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
     @Override
     public ResponseBean getToAuditNotApproved(UserElement userElement, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
         String roleName = jsonObject.getString("roleName");
         TaSysRole sysRole = taSysRoleMapper.selectByRoleName(roleName);
 
+        // 查询 期/栋/单元/楼层/户号 -> 设置 相应 id 和 name
+        TpPhase phase = tpPhaseMapper.selectByPrimaryKey(taUserVerify.getPhaseId());
+        TpBuilding building = tpBuildingMapper.selectByPrimaryKey(taUserVerify.getBuildingId());
+        TpUnit unit = tpUnitMapper.selectByPrimaryKey(taUserVerify.getUnitId());
+        TpLevel level = tpLevelMapper.selectByPrimaryKey(taUserVerify.getLevelId());
+        TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(taUserVerify.getRoomNoId());
+
         taUserVerify.setRoleId(sysRole.getId());
         taUserVerify.setCommunityId(userElement.getCommunityId());
         taUserVerify.setUserId(userElement.getId());
         taUserVerify.setVerifyStatus("0");
         taUserVerify.setCreateDate(new Date());
+        taUserVerify.setPhaseName(phase.getName());
+        taUserVerify.setBuildingName(building.getName());
+        taUserVerify.setUnitName(unit.getName());
+        taUserVerify.setLevelName(level.getName());
+        taUserVerify.setRoomNoName(buildingOwnerInfo.getName());
 
         int rows = taUserVerifyMapper.insertSelective(taUserVerify);
         if (rows <= 0) {

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

     delete from ta_user_verify
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TaUserVerify" >
+  <insert id="insert" parameterType="com.community.huiju.model.TaUserVerify"  keyColumn="id" useGeneratedKeys="true" >
     insert into ta_user_verify (id, user_id, community_id,
       role_id, phase_id, phase_name,
       building_id, building_name, unit_id,
       #{roomNoId,jdbcType=INTEGER}, #{roomNoName,jdbcType=VARCHAR}, #{verifyStatus,jdbcType=VARCHAR},
       #{createDate,jdbcType=TIMESTAMP}, #{verifyName,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserVerify" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserVerify" keyColumn="id" useGeneratedKeys="true">
     insert into ta_user_verify
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

     delete from tp_building
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpBuilding" >
+  <insert id="insert" parameterType="com.community.huiju.model.TpBuilding"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_building (id, community_id, phase_id,
       phase_name, name, sort,
       create_date)
       #{phaseName,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR},
       #{createDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuilding" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuilding"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_building
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

     delete from tp_building_owner_info
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
+  <insert id="insert" parameterType="com.community.huiju.model.TpBuildingOwnerInfo"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_building_owner_info (id, community_id, id_card,
       phase_id, phase_name, building_id,
       building_name, unit_id, unit_name,
       #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER},
       #{updateDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuildingOwnerInfo"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_building_owner_info
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

     id, community_id, phase_id, phase_name, building_id, building_name, unit_id, unit_name, 
     name, sort, create_date
   </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer"  >
     select 
     <include refid="Base_Column_List" />
     from tp_level
     delete from tp_level
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpLevel" >
+  <insert id="insert" parameterType="com.community.huiju.model.TpLevel"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_level (id, community_id, phase_id, 
       phase_name, building_id, building_name, 
       unit_id, unit_name, name, 
       #{unitId,jdbcType=INTEGER}, #{unitName,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{sort,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpLevel" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpLevel"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_level
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

     delete from tp_phase
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpPhase" >
+  <insert id="insert" parameterType="com.community.huiju.model.TpPhase"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_phase (id, community_id, NAME, 
       sort, create_date)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, 
       #{sort,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpPhase" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpPhase"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_phase
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

     delete from tp_unit
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpUnit" >
+  <insert id="insert" parameterType="com.community.huiju.model.TpUnit"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_unit (id, community_id, phase_id, 
       phase_name, building_id, building_name, 
       name, sort, create_date
       #{name,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpUnit" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpUnit"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_unit
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

         Long pages = infoIPage.getPages();
 
 
-        // 行数 默认从 第 5 行开始
-        int currentRow = 5;
+        // 行数 默认从 第 3 行开始
+        int currentRow = 3;
         // 记录坐标
         int index = 0;