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

@@ -1,10 +1,22 @@
 package com.community.huiju.controller;
 
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.IBuildingOwnerInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpSession;
+
 /**
  * version V1.0
  * class_name: $METHOD_NAME$
@@ -17,5 +29,29 @@ import org.springframework.web.bind.annotation.RestController;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "楼栋资料库API",description = "楼栋资料库API")
-public class IBuildingOwnerInfoController {
+public class IBuildingOwnerInfoController extends BaseController {
+    @Autowired
+    private IBuildingOwnerInfo iBuildingOwnerInfo;
+
+    @ApiOperation(value = "关联当前用户房产",notes = "关联当前用户房产")
+    @ApiImplicitParams({@ApiImplicitParam(dataType = "body",dataTypeClass = String.class,name = "paramet",
+            value = "")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    @RequestMapping(value = "/add",method = RequestMethod.POST)
+    public ResponseBean add(@RequestBody String paramet, HttpSession session){
+                return null;
+    }
+
+    @ApiOperation(value = "当前用户未关联的房屋列表",notes = "当前用户未关联的房屋列表")
+    @ApiImplicitParams({@ApiImplicitParam(dataType = "body",dataTypeClass = String.class,name = "paramet",
+            value = "")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    @RequestMapping(value = "/buildingownerinfo",method = RequestMethod.POST)
+    public ResponseBean buildingownerinfoList(@RequestBody String paramet, HttpSession session){
+        UserElement userElement= getUserElement(session);
+        ResponseBean buildingownerinfoList= iBuildingOwnerInfo.buildingownerinfoList(paramet,userElement);
+        return buildingownerinfoList;
+    }
 }

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

@@ -1,14 +1,21 @@
 package com.community.huiju.controller;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.service.ITaUserService;
+import com.community.huiju.service.TaUserVerifyServicel;
 import io.swagger.annotations.Api;
+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 javax.servlet.http.HttpSession;
+
 /**
  * app端用户审核
  *
@@ -20,12 +27,17 @@ import org.springframework.web.bind.annotation.RestController;
 public class UserVerifyController extends BaseController {
 
     @Autowired
-    private ITaUserService iTaUserService;
+    private TaUserVerifyServicel taUserVerifyServicel;
 
-    @RequestMapping(value = "/user/verify", method = RequestMethod.GET)
+    @RequestMapping(value = "/user/verify/{userVerifyId}", method = RequestMethod.GET)
     @ApiOperation(value = "获取当前 一个待审核或审核不通过房产")
-    public ResponseBean getUserVerify() {
-        return null;
+    @ApiImplicitParams({
+            @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);
+        return responseBean;
     }
 
 

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

@@ -35,6 +35,12 @@ public interface TpBuildingOwnerInfoMapper {
     List<TpBuildingOwnerInfo> sellectHouseList(@Param("ownerTel") String ownerTel);
 
     /**
+     * 查询当前房产所在的小区
+     * @return
+     */
+//    List<TpBuildingOwnerInfo> buildingownerinfoList(@Param("name") String name,@Param("phone") String phone);
+
+    /*
      * 根据 小区，期，楼栋，单元，楼层，户号
      * @param communityId
      * @param phase

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

@@ -64,6 +64,10 @@ public class TaUser {
     // 海康人员编号
     private Long hkPersonNo;
 
+    private String openid;
+
+    private String nickname;
+
     // 当前用户下的多套房产
     private List<TpBuildingOwnerInfo> houseList;
 
@@ -274,4 +278,20 @@ public class TaUser {
     public void setIdCard(String idCard) {
         this.idCard = idCard;
     }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid == null ? null : openid.trim();
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname == null ? null : nickname.trim();
+    }
 }

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

@@ -23,10 +23,6 @@ public class TaUserVerify {
 
     private String verifyStatus;
 
-    private String openid;
-
-    private String nickname;
-
     private Date createDate;
 
     /**
@@ -127,22 +123,6 @@ public class TaUserVerify {
         this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
     }
 
-    public String getOpenid() {
-        return openid;
-    }
-
-    public void setOpenid(String openid) {
-        this.openid = openid == null ? null : openid.trim();
-    }
-
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname == null ? null : nickname.trim();
-    }
-
     public Date getCreateDate() {
         return createDate;
     }

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

@@ -1,11 +1,19 @@
 package com.community.huiju.service;
 
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+
 /**
  * 楼栋资料库
  * @author weiximei
  */
 public interface IBuildingOwnerInfo {
 
-
-
+    /**
+     * 查询当前用户未关联的房屋
+     * @param paramet
+     * @param userElement
+     * @return
+     */
+    ResponseBean buildingownerinfoList(String paramet, UserElement userElement);
 }

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

@@ -12,8 +12,9 @@ public interface TaUserVerifyServicel {
     /**
      * 查询 app端用户审核表 的数据
      * @param userElement
+     * @param userVerifyId
      * @return
      */
-    ResponseBean getList(UserElement userElement);
+    ResponseBean getList(UserElement userElement, Integer userVerifyId);
 
 }

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

@@ -1,9 +1,22 @@
 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.TpBuildingOwnerInfoMapper;
+import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.model.TpTransaction;
 import com.community.huiju.service.IBuildingOwnerInfo;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 楼栋资料库实现
  * @author weiximei
@@ -11,4 +24,14 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service
 public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+    @Override
+    public ResponseBean buildingownerinfoList(String paramet, UserElement userElement) {
+        JSONObject object= JSONObject.parseObject(paramet);
+        Map<String, Object> parameter = Maps.newHashMap();
+        Page<TpTransaction> pageLsit= PageHelper.startPage(object.getInteger("pageNum"), object.getInteger("paeSize"));
+//        List<TpBuildingOwnerInfo> TpBuildingOwnerInfoList= tpBuildingOwnerInfoMapper.buildingownerinfoList(object.getString("name"),object.getString("phone"));
+        return null;
+    }
 }

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

@@ -129,12 +129,15 @@ public class TaUserServiceImpl implements ITaUserService {
         // 关联一个审核通过的房产/关联一个待审核房产/关联一个审核未通过房产
         if (taUserVerifies.size() == 1) {
             BeanUtils.copyProperties(currentUser, taUserVO);
+            TaUserVerify userVerify = taUserVerifies.get(0);
+
+            // 设置 这个审核id （这个要返给前端）
+            taUserVO.setUserVerifyId(userVerify.getId());
+
             // 认证状态  0 是未审核   1是审核通过   2是审核不通过
-            String verifyStatus = taUserVerifies.get(0).getVerifyStatus();
+            String verifyStatus = userVerify.getVerifyStatus();
             // 有一个审核通过的房产
             if ("1".equals(verifyStatus)) {
-
-                TaUserVerify userVerify = taUserVerifies.get(0);
                 // 设置 userVO 信息
                 setUserVoProperties(userVerify.getCommunityId(), taUserVO);
 

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

@@ -39,10 +39,9 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
     @Override
-    public ResponseBean getList(UserElement userElement) {
+    public ResponseBean getList(UserElement userElement, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
-        List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectByUserId(userElement.getId());
-        TaUserVerify taUserVerify = taUserVerifies.get(0);
+        TaUserVerify taUserVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
         TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId());
         taUserVerify.setRoleName(taSysRole.getRoleName());
         if ("2".equals(taUserVerify.getVerifyStatus())) {
@@ -51,7 +50,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
             taUserVerify.setOwnerName(tpBuildingOwnerInfo.getOwnerName());
         }
 
-        responseBean.addSuccess(taUserVerifies);
+        responseBean.addSuccess(taUserVerify);
         return responseBean;
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TaUserVO.java

@@ -70,4 +70,7 @@ public class TaUserVO {
     /** 身份证 **/
     private String idCard;
 
+    /** 审核的id **/
+    private Integer userVerifyId;
+
 }

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

@@ -25,11 +25,13 @@
     <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
     <result column="face_status" property="faceStatus" jdbcType="CHAR" />
     <result column="id_card" property="idCard" jdbcType="INTEGER"/>
+    <result column="openid" property="openid" jdbcType="VARCHAR" />
+    <result column="nickname" property="nickname" jdbcType="VARCHAR" />
   </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, id_card
+    create_user, create_date, update_user, update_date, hk_person_no, hk_user_id, hk_card_no, face_status, id_card, openid, nickname
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -48,7 +50,7 @@
       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, id_card
+      hk_user_id, hk_card_no, face_status, id_card, openid, nickname
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
       #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
@@ -57,7 +59,7 @@
       #{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},
-      #{idCard,jdbcType=VARCHAR}
+      #{idCard,jdbcType=VARCHAR}, #{openid,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR},
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
@@ -132,6 +134,12 @@
       <if test="idCard != null">
         id_card,
       </if>
+      <if test="openid != null" >
+        openid,
+      </if>
+      <if test="nickname != null" >
+        nickname,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -203,6 +211,12 @@
       <if test="idCard != null">
         #{idCard,jdbcType=VARCHAR},
       </if>
+      <if test="openid != null" >
+        #{openid,jdbcType=VARCHAR},
+      </if>
+      <if test="nickname != null" >
+        #{nickname,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUser" >
@@ -274,6 +288,12 @@
       <if test="idCard != null">
         id_card = #{idCard,jdbcType=VARCHAR},
       </if>
+      <if test="openid != null" >
+        openid = #{openid,jdbcType=VARCHAR},
+      </if>
+      <if test="nickname != null" >
+        nickname = #{nickname,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -300,7 +320,9 @@
       hk_user_id = #{hkUserId,jdbcType=INTEGER},
       hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
       face_status = #{faceStatus,jdbcType=CHAR},
-      id_card = #{idCard,jdbcType=VARCHAR}
+      id_card = #{idCard,jdbcType=VARCHAR},
+      openid = #{openid,jdbcType=VARCHAR},
+      nickname = #{nickname,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

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

@@ -12,14 +12,12 @@
     <result column="level" property="level" jdbcType="VARCHAR" />
     <result column="room_no" property="roomNo" jdbcType="VARCHAR" />
     <result column="verify_status" property="verifyStatus" jdbcType="VARCHAR" />
-    <result column="openid" property="openid" jdbcType="VARCHAR" />
-    <result column="nickname" property="nickname" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
-      <result column="verify_name" property="verifyName" javaType="VARCHAR" />
+    <result column="verify_name" property="verifyName"/>
   </resultMap>
   <sql id="Base_Column_List" >
     id, user_id, community_id, role_id, phase, building, unit, level, room_no, verify_status, 
-    openid, nickname, create_date, verify_name
+     create_date, verify_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -35,13 +33,13 @@
     insert into ta_user_verify (id, user_id, community_id, 
       role_id, phase, building, 
       unit, level, room_no, 
-      verify_status, openid, nickname, 
+      verify_status,
       create_date, verify_name)
     values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, 
       #{roleId,jdbcType=INTEGER}, #{phase,jdbcType=VARCHAR}, #{building,jdbcType=VARCHAR}, 
       #{unit,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR}, #{roomNo,jdbcType=VARCHAR}, 
-      #{verifyStatus,jdbcType=VARCHAR}, #{openid,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, 
-      #{createDate,jdbcType=TIMESTAMP}, #{verifyName,jdbcType=VARCHAR})
+      #{verifyStatus,jdbcType=VARCHAR},
+      #{createDate,jdbcType=TIMESTAMP}, #{verifyName})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserVerify" >
     insert into ta_user_verify
@@ -76,12 +74,6 @@
       <if test="verifyStatus != null" >
         verify_status,
       </if>
-      <if test="openid != null" >
-        openid,
-      </if>
-      <if test="nickname != null" >
-        nickname,
-      </if>
       <if test="createDate != null" >
         create_date,
       </if>
@@ -120,17 +112,11 @@
       <if test="verifyStatus != null" >
         #{verifyStatus,jdbcType=VARCHAR},
       </if>
-      <if test="openid != null" >
-        #{openid,jdbcType=VARCHAR},
-      </if>
-      <if test="nickname != null" >
-        #{nickname,jdbcType=VARCHAR},
-      </if>
       <if test="createDate != null" >
         #{createDate,jdbcType=TIMESTAMP},
       </if>
       <if test="verifyName != null">
-          #{verifyName,jdbcType=VARCHAR},
+          #{verifyName},
       </if>
     </trim>
   </insert>
@@ -164,17 +150,11 @@
       <if test="verifyStatus != null" >
         verify_status = #{verifyStatus,jdbcType=VARCHAR},
       </if>
-      <if test="openid != null" >
-        openid = #{openid,jdbcType=VARCHAR},
-      </if>
-      <if test="nickname != null" >
-        nickname = #{nickname,jdbcType=VARCHAR},
-      </if>
       <if test="createDate != null" >
         create_date = #{createDate,jdbcType=TIMESTAMP},
       </if>
       <if test="verifyName != null">
-          verify_name = #{verifyName, jdbcType=VARCHAR}
+          verify_name = #{verifyName}
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -190,10 +170,8 @@
       level = #{level,jdbcType=VARCHAR},
       room_no = #{roomNo,jdbcType=VARCHAR},
       verify_status = #{verifyStatus,jdbcType=VARCHAR},
-      openid = #{openid,jdbcType=VARCHAR},
-      nickname = #{nickname,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
-      verify_name = #{verifyName,jdbcType=VARCHAR}
+      verify_name = #{verifyName}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByUserId" resultMap="BaseResultMap" parameterType="integer">

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

@@ -158,4 +158,15 @@ public class BuildingOwnerInfoController extends BaseController {
         ResponseBean userParent=iBuildingOwnerInfoService.updataApprove(paramets);
         return userParent;
     }
+
+    @ApiOperation(value = "小区楼栋资料表",nickname ="小区楼栋资料表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="phase:期,building:楼栋 ,unit:单元,level:楼层，roomNo:户号， pageNum:每页显示多少条,pageSzie:当前页数"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")})
+    @RequestMapping(value="/buildinglist",method = RequestMethod.POST)
+    public ResponseBean buildinglist(@RequestBody String paramets,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean buildinglist=iBuildingOwnerInfoService.buildinglist(paramets,userElement);
+        return buildinglist;
+    }
 }

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

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.TpBuilding;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TpBuildingMapper extends BaseMapper<TpBuilding> {
+
+    /**
+     * 楼栋资料库列表
+     * @param page
+     * @param tpBuilding
+     * @return
+     */
+    IPage<TpBuilding> buildinglist(Page<TpBuilding> page, @Param("tpBuilding") TpBuilding tpBuilding);
+}

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

@@ -1,5 +1,4 @@
 package com.community.huiju.model;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

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

@@ -0,0 +1,29 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpBuilding implements Serializable {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String phase;
+
+    private String building;
+
+    private String unit;
+
+    private String level;
+
+    private String roomNo;
+
+    private Date createDate;
+
+}

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

@@ -87,4 +87,12 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @return
      */
     ResponseBean deleteIds(List<Integer> ids, Integer propertyUserId);
+
+    /**
+     * 楼栋资料库列表
+     * @param paramets
+     * @param userElement
+     * @return
+     */
+    ResponseBean buildinglist(String paramets, UserElement userElement);
 }

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

@@ -24,8 +24,7 @@ import com.community.huiju.service.ITaUserService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.ibatis.binding.MapperMethod;
-import org.apache.ibatis.session.SqlSession;
+
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -78,6 +77,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Autowired
     private IBillInvoiceService iBillInvoiceService;
+
+    @Autowired
+    private TpBuildingMapper tpBuildingMapper;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
@@ -763,6 +765,32 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         return responseBean;
     }
 
+    @Override
+    public ResponseBean buildinglist(String paramets, UserElement userElement) {
+        ResponseBean responseBean= new ResponseBean();
+
+        TpBuilding   tpBuilding= JSONObject.parseObject(paramets, TpBuilding.class);
+        JSONObject object= JSONObject.parseObject(paramets);
+
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<TpBuilding> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<TpBuilding> pageInfo = tpBuildingMapper.buildinglist(page,tpBuilding);
+        List<TpBuilding> tpBuildingList = pageInfo.getRecords();
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("list", tpBuildingList);
+        map.put("total", pageInfo.getTotal());
+        map.put("pageNum", pageInfo.getCurrent());
+        map.put("pageSize", pageInfo.getSize());
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
     /**
      * 根据 手机号 和 小区Id 查询用户
      * @param phone

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

@@ -0,0 +1,35 @@
+<?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.TpBuildingMapper" >
+  <sql id="Base_Column_List" >
+    id, community_id, phase, building, unit, `level`, room_no, create_date
+  </sql>
+  <select id="buildinglist" resultType="com.community.huiju.model.TpBuilding">
+    select
+    <include refid="Base_Column_List" />
+    from tp_building
+    <where>
+      <if test="tpBuilding.phase != null and tpBuilding.phase != ''" >
+        phase = #{tpBuilding.phase,jdbcType=VARCHAR}
+      </if>
+      <if test="tpBuilding.building != null and tpBuilding.building != ''" >
+        and building = #{tpBuilding.building,jdbcType=VARCHAR}
+      </if>
+      <if test="tpBuilding.unit != null and tpBuilding.unit != ''" >
+        and unit = #{tpBuilding.unit,jdbcType=VARCHAR}
+      </if>
+      <if test="tpBuilding.level != null and tpBuilding.level != ''" >
+        and `level` = #{tpBuilding.level,jdbcType=VARCHAR}
+      </if>
+      <if test="tpBuilding.roomNo != null and tpBuilding.roomNo != ''" >
+       and room_no = #{tpBuilding.roomNo,jdbcType=VARCHAR}
+      </if>
+    </where>
+    ORDER BY
+    phase ASC,
+    building ASC,
+    unit ASC,
+    `level` ASC,
+    room_no ASC
+  </select>
+</mapper>

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

@@ -112,3 +112,36 @@ export function getByIdBuildingId(buildingId) {
   })
 }
 
+// 获取楼栋业主信息列表
+export function communityBuildinglist(data) {
+  return request({
+    url: '/buildinglist',
+    method: 'post',
+    data: {
+      phase: data.phase,
+      building: data.building,
+      unit: data.unit,
+      level: data.level,
+      roomNo: data.roomNo,
+      ownerName: data.ownerName,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}
+// 查询小区楼栋资料库
+export function BuildingHouse(data) {
+  const config = {
+    url: '/Buildinghouse',
+    method: 'post',
+    data: {
+      phase: data.phase,
+      building: data.building,
+      unit: data.unit,
+      level: data.level,
+      roomNo: data.roomNo
+    }
+  }
+  return request(config)
+}
+

VUECODE/smart-property-manage/src/router/index.js

@@ -36,6 +36,12 @@ export const constantRouterMap = [
         name: 'building-index',
         meta: { title: '楼栋业主资料库', icon: 'building' }
       },
+      {
+        path: '/building/buildingdata/index',
+        component: () => import('@/views/building/buildingdata/index'),
+        name: 'building-data',
+        meta: { title: '楼栋树管理', icon: 'building' }
+      },
       {
         path: '/owner/index',
         component: () => import('@/views/owner/index'),

VUECODE/smart-property-manage/src/store/modules/buildingOwnerInfo.js

@@ -1,5 +1,5 @@
 
-import { buildingAddress, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification } from '@/api/buildingOwnerInfo'
+import { buildingAddress, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, puildingHouse } from '@/api/buildingOwnerInfo'
 
 const buildingOwnerInfo = {
   state: {
@@ -86,6 +86,24 @@ const buildingOwnerInfo = {
           reject(error)
         })
       })
+    },
+    CommunityBuildinglist({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        communityBuildinglist(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    BuildingHouse({ commit }, data) { // 小区楼栋资料 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        puildingHouse(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/building/buildingdata/index.vue

@@ -0,0 +1,221 @@
+<template>
+    <div>
+            <el-form :inline="true"  class="form-listQuery">
+      <el-form-item label="楼盘库">
+        <el-select v-model="listQuery.phase" placeholder="期/区" @change="buildSelectChange(0)">
+          <!--<el-option label="选择楼栋" value="-1" />-->
+          <el-option
+            v-for="item in phaseList"
+            :key="item.id"
+            :label="item.phase"
+            :value="item.phase"/>
+        </el-select>
+        <el-select v-model="listQuery.building" placeholder="栋" @change="buildSelectChange(1)">
+          <!--<el-option label="选择楼栋" value="-1" />-->
+          <el-option
+            v-for="item in buildingList"
+            :key="item.id"
+            :label="item.building"
+            :value="item.building"/>
+        </el-select>
+        <el-select v-model="listQuery.unit" placeholder="单元" @change="buildSelectChange(2)">
+          <!--<el-option label="选择单元" value="-1" />-->
+          <el-option
+            v-for="item in unitList"
+            :key="item.id"
+            :label="item.unit"
+            :value="item.unit"/>
+        </el-select>
+        <el-select v-model="listQuery.level" placeholder="楼层" @change="buildSelectChange(3)">
+          <!--<el-option label="选择楼层" value="-1" />-->
+          <el-option
+            v-for="item in levelList"
+            :key="item.id"
+            :label="item.level"
+            :value="item.level"/>
+        </el-select>
+        <el-select v-model="listQuery.roomNo" placeholder="户号">
+          <!--<el-option label="选择户号" value="-1" />-->
+          <el-option
+            v-for="item in roomNoList"
+            :key="item.id"
+            :label="item.roomNo"
+            :value="item.roomNo"/>
+        </el-select>
+        <el-form-item label="业主名称">
+          <el-input v-model="listQuery.ownerName" placeholder="业主名称" />
+        </el-form-item>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" @click="emptyListQuery">清空</el-button>
+        <el-button type="primary" @click="conditionsQuery">查询</el-button>
+      </el-form-item>       
+    </el-form>
+  <el-table
+    :data="tableData"
+    style="width: 100%"> 
+    <el-table-column
+      type="selection"
+      width="55">
+    </el-table-column>
+    <!-- <el-table-column type="expand">
+      <template slot-scope="props">
+        <el-form label-position="left" inline class="demo-table-expand">
+          <el-form-item label="楼层">
+            <span>{{ props.row.level }}</span>
+          </el-form-item>
+          <el-form-item label="户号">
+            <span>{{ props.row.roomNo }}</span>
+            <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+             <el-button
+          size="mini"
+          type="danger"
+          @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+          </el-form-item> 
+        </el-form>
+      </template>
+    </el-table-column> -->
+    <el-table-column
+      label="期"
+      prop="phase">
+    </el-table-column>
+    <el-table-column
+      label="楼栋"
+      prop="building">
+    </el-table-column>
+    <el-table-column
+      label="单元"
+      prop="unit">
+    </el-table-column>
+    <el-table-column
+      label="楼层"
+      prop="level">
+    </el-table-column>
+    <el-table-column
+      label="户号"
+      prop="roomNo">
+    </el-table-column>
+    </el-table>
+   <div class="block">
+        <el-pagination
+        :current-page="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<style>
+  .demo-table-expand {
+    font-size: 0;
+  }
+  .demo-table-expand label {
+    width: 90px;
+    color: #99a9bf;
+  }
+  .demo-table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+    width: 50%;
+  }
+</style>
+
+
+<script>
+  export default {
+    data() {
+      return {
+        listQuery: {
+        phase: '',
+        building: '',
+        unit: '',
+        level: '',
+        roomNo: '',
+        ownerName: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0, // 数据总数
+      phaseList: [], // 期 集合
+      buildingInfoLists: [], // 表格数据集合
+      buildingList: [], // seletc 楼栋集合
+      unitList: [], // seletc 单元集合
+      levelList: [], // seletc 层 集合
+      roomNoList: [], //  seletc 户号集合
+      listLoading: true, // 加载圈
+      deleteIds: [], // 需要删除的id集合
+      tableData: []
+      }
+    },
+      mounted() {
+    // 获取数据
+    this.dataQuery()
+  },
+    methods: {
+    dataQuery() { // 查询数据
+        this.listLoading = true
+        this.$store.dispatch('CommunityBuildinglist', this.listQuery).then((res) => {
+        const resData = res.data
+        this.userPassCertification = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = 10
+        this.total = resData.total
+        this.tableData = resData.list
+        console.log('this.tableData',this.tableData)
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error BuildingInfoList')
+      })
+    }    
+    },
+    buildSelectChange(value) { // select 的 change
+      switch (value) {
+        case 0: // 查询栋
+          this.buildingList = []
+          this.unitList = []
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.building = ''
+          this.listQuery.unit = ''
+          this.listQuery.level = ''
+          this.listQuery.roomNo = ''
+          this.getBuild()
+          break
+        case 1: // 查询 单元
+          this.unitList = []
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.unit = ''
+          this.listQuery.level = ''
+          this.listQuery.roomNo = ''
+          this.getUnit()
+          break
+        case 2: // 查询 楼层
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.level = ''
+          this.listQuery.roomNo = ''
+          this.getLevel()
+          break
+        case 3: // 查询 户号
+          this.roomNoList = []
+          this.listQuery.roomNo = ''
+          this.getRoomNo()
+          break
+      }
+    },
+  }
+  
+</script>
+<style>
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+</style>