完成 楼栋业主信息, 前后端

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

@@ -2,6 +2,10 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpBuildingOwnerInfo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface TpBuildingOwnerInfoMapper {
@@ -16,4 +20,7 @@ public interface TpBuildingOwnerInfoMapper {
     int updateByPrimaryKeySelective(TpBuildingOwnerInfo record);
 
     int updateByPrimaryKey(TpBuildingOwnerInfo record);
+
+    @Select("select * from tp_building_owner_info where community_id=#{communityId} and owner_tel=#{ownerTel}")
+    List<TpBuildingOwnerInfo> getByCommunityIdAndOwnerTel(@Param("communityId") Integer communityId, @Param("ownerTel") String ownerTel);
 }

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

@@ -17,6 +17,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
@@ -29,10 +30,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.SimpleFormatter;
 
 /**
@@ -187,7 +185,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setAcceptAgreementStatus("1");
         user.setUserName(user.getLoginName());
         user.setRemark("这是系统自动注册!");
-        user.setVerifyStatus("1");
+        user.setVerifyStatus("0");
         user.setFaceStatus("0");
         //user.setLoginPassword(MD5Utils.encode(user.getLoginPassword()));
         taUserMapper.insertSelective(user);
@@ -195,10 +193,19 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setCreateUser(user.getId());
         user.setUpdateUser(user.getId());
 
+        // 查询资料库
+        List<TpBuildingOwnerInfo> buildingOwnerInfoList = tpBuildingOwnerInfoMapper.getByCommunityIdAndOwnerTel(user.getCommunityId(), user.getLoginName());
+        if (CollectionUtils.isNotEmpty(buildingOwnerInfoList)) {
+            TpBuildingOwnerInfo buildingOwnerInfo = buildingOwnerInfoList.get(0);
+            user.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
+            user.setVerifyStatus("1");
+        }
+
         // 更新
         taUserMapper.updateByPrimaryKeySelective(user);
 
         // TODO 这里先默认 type=1 (业主), 后期需要和 资料库对接
+        // TODO 资料库已经对接, 新注册的默认为 业主, 后期需要改为只有匹配了资料库后才是业主
         addOrUpdateUserRole(1,response,user,true);
 
 

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -81,12 +81,15 @@ public class Constant {
 
     /**业主角色**/
     public static final String OWNER = "OWNER";
+    public static final Integer OWNER_ID = 1;
 
     /**租客角色**/
     public static final String TENANT = "TENANT";
+    public static final Integer TENANT_ID = 2;
 
     /**家属角色**/
     public static final String RELATION = "RELATION";
+    public static final Integer RELATION_ID = 3;
     
     /** 工单回复的发起人 **/
     public static final String TICKET_USER_TYPE = "1";

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

@@ -12,12 +12,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.PostMapping;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpSession;
@@ -55,6 +50,18 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取楼栋业主信息详情", notes = "获取楼栋业主信息详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "id",value = "楼栋业主信息Id")
+    })
+    @RequestMapping(value = "/building/{id}", method = RequestMethod.GET)
+    public ResponseBean getById(@PathVariable(value = "id") Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.addSuccess(iBuildingOwnerInfoService.getById(id));
+        return responseBean;
+
+    }
+
     @ApiOperation(value = "修改楼栋业务信息", notes = "修改楼栋业主信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "id编号;building栋;" +
@@ -73,7 +80,7 @@ public class BuildingOwnerInfoController extends BaseController {
 
     @ApiOperation(value = "添加楼栋业务信息", notes = "添加楼栋业务信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id编号;building栋;" +
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "building栋;" +
                     "unit单元;level楼层;roomNo户号;" +
                     "ownerName业主姓名;" +
                     "ownerTel业主手机号"),

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

@@ -0,0 +1,29 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaSysUserRole;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * app端用户是那些角色 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-21
+ */
+@Mapper
+public interface TaSysUserRoleMapper extends BaseMapper<TaSysUserRole> {
+
+    /**
+     * 根据 用户id 和 小区Id  删除数据
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @Delete("delete from ta_sys_user_role where community_id=#{communityId} and user_id=#{userId}")
+    int deleteByCommunityIdAndUserId(@Param("communityId") Integer communityId, @Param("userId") Integer userId);
+
+}

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

@@ -0,0 +1,47 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * app端用户是那些角色
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_sys_user_role")
+public class TaSysUserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+
+
+}

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

@@ -23,6 +23,8 @@ public class TaUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private Integer id;
+
     /**
      * 小区id
      */

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.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 lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,6 +29,7 @@ public class TpBuildingOwnerInfo implements Serializable {
     /**
      * 主键
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TaSysUserRole;
+
+/**
+ * <p>
+ * app端用户是那些角色 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-21
+ */
+public interface ITaSysUserRoleService extends IService<TaSysUserRole> {
+
+}

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

@@ -11,13 +11,17 @@ import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.BeanTools;
 
+import com.community.huiju.dao.TaSysUserRoleMapper;
 import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.dao.UserMapper;
 import com.community.huiju.exception.WisdomException;
+import com.community.huiju.model.TaSysUserRole;
 import com.community.huiju.model.TaUser;
 
 import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
 import com.community.huiju.model.TpBuildingOwnerInfo;
 
+import com.community.huiju.model.User;
 import com.community.huiju.service.IBuildingOwnerInfoService;
 import com.google.common.collect.Maps;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -58,6 +62,12 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     
     @Autowired
     private TaUserMapper taUserMapper;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Autowired
+    private TaSysUserRoleMapper taSysUserRoleMapper;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
@@ -87,6 +97,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map,false);
         queryWrapper.like(tpBuildingOwnerInfo.getOwnerName() != null,"owner_name", tpBuildingOwnerInfo.getOwnerName());
+        queryWrapper.ne("verify_status", 2);
 
         // 分页查询
         IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, queryWrapper);
@@ -96,12 +107,12 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         // 获取数据
         List<TpBuildingOwnerInfo> list = infoIPage.getRecords();
 
-        retMap.put("data", list);
+        retMap.put("list", list);
         retMap.put("total", infoIPage.getTotal());
         retMap.put("pageNum", infoIPage.getCurrent());
         retMap.put("pageSize", infoIPage.getSize());
 
-        responseBean.addSuccess(list);
+        responseBean.addSuccess(retMap);
 
         return responseBean;
     }
@@ -113,11 +124,71 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         ResponseBean responseBean = new ResponseBean();
 
         TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
+        if (!AccountValidatorUtil.isPhone(tpBuildingOwnerInfo.getOwnerTel())){
+            responseBean.addError("请输入正取的手机号!");
+            return responseBean;
+        }
+
+
         TpBuildingOwnerInfo oldTpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(tpBuildingOwnerInfo.getId());
         if (null == oldTpBuildingOwnerInfo) {
             throw new WisdomException("%s 数据不存在!", tpBuildingOwnerInfo.getId());
         }
 
+        // 物业端的用户,也就是正在操作的物业人员
+        User user = userMapper.selectById(userId);
+
+        /**
+         * 修改的时候, 如果提交上来的数据和要被修改的数据是一样的! 直接返回操作成功!
+         */
+
+        // 标记是否修改了手机号
+        boolean phoneBool = false;
+
+        // 校验楼栋信息表
+        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        // 小区ID
+        queryWrapper.eq("community_id", user.getCommunityId());
+        // 栋
+        queryWrapper.eq("building", tpBuildingOwnerInfo.getBuilding());
+        // 单元
+        queryWrapper.eq("unit", tpBuildingOwnerInfo.getUnit());
+        // 楼层
+        queryWrapper.eq("level", tpBuildingOwnerInfo.getLevel());
+        // 房号
+        queryWrapper.eq("room_no", tpBuildingOwnerInfo.getRoomNo());
+        TpBuildingOwnerInfo selectBuild = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
+        // 如果数据查询到了, 并且手机号和传上来的手机号是一样的是, 代表就是原数据, 直接返回操作成功
+        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(queryWrapper);
+
+            // 如果 通过手机号查询出来的楼栋信息数据的 id 和 传上来的 楼栋,单元,楼层,单元,户号 查询出来的数据的id 匹配, 那么就表示这个手机号已经绑定了其他的楼栋信息
+            if (selectBuildPhone.getId().intValue() != selectBuild.getId().intValue()){
+                responseBean.addError("该手机号已存在!");
+                return responseBean;
+            }
+
+            // 开始修改手机号
+            phoneBool = true;
+
+            // 查询到了数据, 就表示新数据, 在库里面已经存在! 可能就是别业主的! 不能被修改为当前这个业主的!
+        } else if (null != selectBuild && phoneBool == false){
+            responseBean.addError("该户号已存在!");
+            return responseBean;
+        }
+
+        // 开始修改手机号操作!
+
         BeanTools.copyProperties(tpBuildingOwnerInfo, oldTpBuildingOwnerInfo);
 
         oldTpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
@@ -125,6 +196,30 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         int row = tpBuildingOwnerInfoMapper.updateById(oldTpBuildingOwnerInfo);
         if (row <= 0) {
+            log.error("修改操作! 修改楼栋信息表数据失败! 更新ID: ", oldTpBuildingOwnerInfo.getId());
+            throw new WisdomException("操作失败!");
+        }
+
+        // 修改 APP 端业主用户的手机号信息!
+        // 开始匹配 APP 端用户表
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("login_name", tpBuildingOwnerInfo.getOwnerTel());
+        taUserQueryWrapper.eq("community_id", tpBuildingOwnerInfo.getCommunityId());
+        // 查询 APP 端业主
+        TaUser appOwnerUser = taUserMapper.selectOne(taUserQueryWrapper);
+        if (null != appOwnerUser) {
+            // 修改手机号
+            appOwnerUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
+            row = taUserMapper.updateById(appOwnerUser);
+
+            // 更新APP端用户的角色身份为 业主
+            updateAppRole(tpBuildingOwnerInfo.getCommunityId(), appOwnerUser.getId(), Constant.OWNER_ID);
+        }
+
+
+
+        if (row <= 0) {
+            log.error("修改操作! 修改楼栋信息表过程中, 修改 APP 端失败信息失败!");
             throw new WisdomException("操作失败!");
         } else {
             responseBean.addSuccess("操作成功!");
@@ -138,14 +233,91 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         ResponseBean responseBean = new ResponseBean();
 
         TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
+        // 物业端的用户,也就是正在操作的物业人员
+        User user = userMapper.selectById(userId);
+        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;
+        }
+
+        // 校验楼栋信息表
+        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        // 小区ID
+        queryWrapper.eq("community_id", user.getCommunityId());
+        // 栋
+        queryWrapper.eq("building", tpBuildingOwnerInfo.getBuilding());
+        // 单元
+        queryWrapper.eq("unit", tpBuildingOwnerInfo.getUnit());
+        // 楼层
+        queryWrapper.eq("level", tpBuildingOwnerInfo.getLevel());
+        // 房号
+        queryWrapper.eq("room_no", tpBuildingOwnerInfo.getRoomNo());
+        selectBuild = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
+        if (null != selectBuild) {
+            responseBean.addError("该楼层的户号,已存在!");
+            return responseBean;
+        }
+
         // 主键是自增的, 所以设置为 null
         tpBuildingOwnerInfo.setId(null);
         tpBuildingOwnerInfo.setUpdateUser(userId);
         tpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
         tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
         tpBuildingOwnerInfo.setCreateUser(userId);
+        tpBuildingOwnerInfo.setVerifyStatus("0");
+
+        // 添加的时候, 默认是当前操作的小区
+        tpBuildingOwnerInfo.setCommunityId(user.getCommunityId());
 
         int row = tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
+        if (row <= 0) {
+            log.error("添加操作! 楼栋业主信息表 失败!");
+            throw new WisdomException("操作失败!");
+        }
+
+        // 开始匹配 APP 端用户表
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("login_name", tpBuildingOwnerInfo.getOwnerTel());
+        taUserQueryWrapper.eq("community_id", tpBuildingOwnerInfo.getCommunityId());
+        // 查询 APP 端业主
+        TaUser appOwnerUser = taUserMapper.selectOne(taUserQueryWrapper);
+        if (null != appOwnerUser) {
+            // 更新 APP 端用户认证的状态
+            appOwnerUser.setBuildingOwnerInfoId(tpBuildingOwnerInfo.getId());
+            // 认证状态  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);
+        }
+
+
         if (row <= 0) {
             throw new WisdomException("操作失败!");
         } else {
@@ -155,6 +327,22 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         return responseBean;
     }
 
+    /**
+     * 修改 APP 端用户的角色
+     * @param communityId 小区Id
+     * @param appUserId APP 端用户Id
+     * @param roleId 角色Id
+     */
+    private void updateAppRole(Integer communityId, Integer appUserId, Integer roleId) {
+        // 更新APP端用户的角色身份
+        taSysUserRoleMapper.deleteByCommunityIdAndUserId(communityId, appUserId);
+        TaSysUserRole taSysUserRole = new TaSysUserRole();
+        taSysUserRole.setUserId(appUserId);
+        taSysUserRole.setRoleId(Constant.OWNER_ID);
+        taSysUserRole.setCommunityId(communityId);
+        taSysUserRoleMapper.insert(taSysUserRole);
+    }
+
     @Override
     public ResponseBean getBuildingOrUnitOrNumber(String parameter,Integer communityId) {
 
@@ -191,17 +379,6 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
          *
          */
 
-        String column = null;
-        if (null == tpBuildingOwnerInfo.getBuilding()) {
-            column = "building";
-        } else if (null == tpBuildingOwnerInfo.getUnit()) {
-            column = "unit";
-        } else if (null == tpBuildingOwnerInfo.getLevel()){
-            column = "level";
-        } else if (null == tpBuildingOwnerInfo.getRoomNo()) {
-            column = "room_no";
-        }
-        queryWrapper.groupBy(column);
         List<TpBuildingOwnerInfo> selectList = tpBuildingOwnerInfoMapper.selectList(queryWrapper);
 
         responseBean.addSuccess(selectList);

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaSysUserRoleMapper;
+import com.community.huiju.model.TaSysUserRole;
+import com.community.huiju.service.ITaSysUserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * app端用户是那些角色 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-21
+ */
+@Service
+public class TaSysUserRoleServiceImpl extends ServiceImpl<TaSysUserRoleMapper, TaSysUserRole> implements ITaSysUserRoleService {
+
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TaSysUserRoleMapper">
+
+</mapper>

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

@@ -15,7 +15,7 @@ export function buildingAddress(data) {
   return request(config)
 }
 
-// 获取楼栋业主信息
+// 获取楼栋业主信息列表
 export function buildingList(data) {
   return request({
     url: '/building/list',
@@ -32,3 +32,53 @@ export function buildingList(data) {
   })
 }
 
+// 批量删除 楼栋业主信息
+export function deleteBuilding(data) {
+  return request({
+    url: '/building/delete',
+    method: 'delete',
+    data
+  })
+}
+
+// 添加楼栋业主信息
+export function addBuilding(data) {
+  return request({
+    url: '/building/add',
+    method: 'post',
+    data: {
+      building: data.building,
+      unit: data.unit,
+      level: data.level,
+      roomNo: data.roomNo,
+      ownerName: data.ownerName,
+      ownerTel: data.ownerTel
+    }
+  })
+}
+
+// 修改楼栋业主信息
+export function updateBuilding(data) {
+  return request({
+    url: '/building/update',
+    method: 'put',
+    data: {
+      id: data.id,
+      building: data.building,
+      unit: data.unit,
+      level: data.level,
+      roomNo: data.roomNo,
+      ownerName: data.ownerName,
+      ownerTel: data.ownerTel
+    }
+  })
+}
+
+// 根据楼栋信息 id 查询
+export function getByIdBuildingId(buildingId) {
+  return request({
+    url: '/building/' + buildingId,
+    method: 'get'
+  })
+}
+

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

@@ -74,6 +74,20 @@ export const constantRouterMap = [
         name: 'batch-import',
         hidden: true,
         meta: { title: '批量导入楼栋信息', icon: 'table' }
+      },
+      {
+        path: '/building/add',
+        component: () => import('@/views/building/add/index'),
+        name: 'building-add',
+        hidden: true,
+        meta: { title: '添加楼栋业主资料', icon: 'table' }
+      },
+      {
+        path: '/building/edi',
+        component: () => import('@/views/building/edi/index'),
+        name: 'building-edi',
+        hidden: true,
+        meta: { title: '修改楼栋业主资料', icon: 'table' }
       }
     ]
   },

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

@@ -1,4 +1,4 @@
-import { buildingAddress, buildingList } from '@/api/buildingOwnerInfo'
+import { buildingAddress, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId } from '@/api/buildingOwnerInfo'
 
 const buildingOwnerInfo = {
   state: {
@@ -30,6 +30,42 @@ const buildingOwnerInfo = {
           reject(error)
         })
       })
+    },
+    DeleteBuilding({ commit }, data) { // 批量删除
+      return new Promise((resolve, reject) => {
+        deleteBuilding(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    UpdateBuilding({ commit }, data) { // 修改楼栋业主信息
+      return new Promise((resolve, reject) => {
+        updateBuilding(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    AddBuilding({ commit }, data) { // 修改楼栋业主信息
+      return new Promise((resolve, reject) => {
+        addBuilding(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetByIdBuildingId({ commit }, data) { // 根据楼栋信息id查询
+      return new Promise((resolve, reject) => {
+        getByIdBuildingId(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -1,23 +1,23 @@
 <template>
   <div class="root">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
-      <el-form-item label="栋" prop="name">
-        <el-input v-model="ruleForm.name"/>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
+      <el-form-item label="栋" prop="building">
+        <el-input v-model="ruleForm.building"/>
       </el-form-item>
-      <el-form-item label="单元" prop="region">
-        <el-input v-model="ruleForm.name"/>
+      <el-form-item label="单元" prop="unit">
+        <el-input v-model="ruleForm.unit"/>
       </el-form-item>
-      <el-form-item label="楼层" required>
-        <el-input v-model="ruleForm.name"/>
+      <el-form-item label="楼层" prop="level">
+        <el-input v-model="ruleForm.level"/>
       </el-form-item>
-      <el-form-item label="户号" prop="delivery">
-        <el-switch v-model="ruleForm.delivery"/>
+      <el-form-item label="户号" prop="roomNo">
+        <el-input v-model="ruleForm.roomNo"/>
       </el-form-item>
-      <el-form-item label="业主姓名" prop="type">
-        <el-input v-model="ruleForm.name"/>
+      <el-form-item label="业主姓名" prop="ownerName">
+        <el-input v-model="ruleForm.ownerName"/>
       </el-form-item>
-      <el-form-item label="业主手机号" prop="resource">
-        <el-input v-model="ruleForm.name"/>
+      <el-form-item label="业主手机号" prop="ownerTel">
+        <el-input v-model="ruleForm.ownerTel"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
@@ -32,59 +32,84 @@ export default {
   data() {
     return {
       ruleForm: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
+        building: '',
+        unit: '',
+        level: '',
+        roomNo: '',
+        ownerName: '',
+        ownerTel: ''
       },
       rules: {
-        name: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        building: [
+          { required: true, message: '请输入楼栋', trigger: 'blur' }
         ],
-        region: [
-          { required: true, message: '请选择活动区域', trigger: 'change' }
+        unit: [
+          { required: true, message: '请输入单元', trigger: 'blur' }
         ],
-        date1: [
-          { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+        level: [
+          { required: true, message: '请输入楼层', trigger: 'blur' }
         ],
-        date2: [
-          { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+        roomNo: [
+          { required: true, message: '请输入户号', trigger: 'blur' }
         ],
-        type: [
-          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+        ownerName: [
+          { required: true, message: '请输入姓名', trigger: 'blur' }
         ],
-        resource: [
-          { required: true, message: '请选择活动资源', trigger: 'change' }
-        ],
-        desc: [
-          { required: true, message: '请填写活动形式', trigger: 'blur' }
+        ownerTel: [
+          { required: true, message: '请输入手机号', trigger: 'blur' },
+          { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
         ]
       }
     }
   },
   methods: {
-    submitForm(formName) {
+    submitForm(formName) { // 提交
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          alert('submit!')
+          this.addBuilding()
         } else {
           console.log('error submit!!')
           return false
         }
       })
     },
-    resetForm(formName) {
+    resetForm(formName) { // 重置
       this.$refs[formName].resetFields()
+    },
+    addBuilding() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('AddBuilding', this.ruleForm).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'building-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error AddBuilding')
+      })
     }
   }
 }
 </script>
 
 <style scoped>
-
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
 </style>

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

@@ -1,27 +1,30 @@
 <template>
   <div class="root">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
-      <el-form-item label="栋" prop="name">
-        <el-input v-model="ruleForm.name"/>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
+      <el-form-item v-show="false" label="编号" >
+        <el-input v-model="ruleForm.id" disabled/>
       </el-form-item>
-      <el-form-item label="单元" prop="region">
-        <el-input v-model="ruleForm.name"/>
+      <el-form-item label="栋" prop="building">
+        <el-input v-model="ruleForm.building"/>
       </el-form-item>
-      <el-form-item label="楼层" required>
-        <el-input v-model="ruleForm.name"/>
+      <el-form-item label="单元" prop="unit">
+        <el-input v-model="ruleForm.unit"/>
       </el-form-item>
-      <el-form-item label="户号" prop="delivery">
-        <el-switch v-model="ruleForm.delivery"/>
+      <el-form-item label="楼层" prop="level">
+        <el-input v-model="ruleForm.level"/>
       </el-form-item>
-      <el-form-item label="业主姓名" prop="type">
-        <el-input v-model="ruleForm.name"/>
+      <el-form-item label="户号" prop="roomNo">
+        <el-input v-model="ruleForm.roomNo"/>
       </el-form-item>
-      <el-form-item label="业主手机号" prop="resource">
-        <el-input v-model="ruleForm.name"/>
+      <el-form-item label="业主姓名" prop="ownerName">
+        <el-input v-model="ruleForm.ownerName"/>
+      </el-form-item>
+      <el-form-item label="业主手机号" prop="ownerTel">
+        <el-input v-model="ruleForm.ownerTel"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
-        <el-button @click="resetForm('ruleForm')">重置</el-button>
+        <el-button @click="backIndex">返回</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -32,59 +35,107 @@ export default {
   data() {
     return {
       ruleForm: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
+        id: '',
+        building: '',
+        unit: '',
+        level: '',
+        roomNo: '',
+        ownerName: '',
+        ownerTel: ''
       },
+      listQuery: [], // 查询的参数
       rules: {
-        name: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-        ],
-        region: [
-          { required: true, message: '请选择活动区域', trigger: 'change' }
+        building: [
+          { required: true, message: '请输入楼栋', trigger: 'blur' }
         ],
-        date1: [
-          { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+        unit: [
+          { required: true, message: '请输入单元', trigger: 'blur' }
         ],
-        date2: [
-          { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+        level: [
+          { required: true, message: '请输入楼层', trigger: 'blur' }
         ],
-        type: [
-          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+        roomNo: [
+          { required: true, message: '请输入户号', trigger: 'blur' }
         ],
-        resource: [
-          { required: true, message: '请选择活动资源', trigger: 'change' }
+        ownerName: [
+          { required: true, message: '请输入姓名', trigger: 'blur' }
         ],
-        desc: [
-          { required: true, message: '请填写活动形式', trigger: 'blur' }
+        ownerTel: [
+          { required: true, message: '请输入手机号', trigger: 'blur' },
+          { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
         ]
       }
     }
   },
+  mounted() {
+    this.listQuery = this.$route.params.listQuery
+    this.getById(this.$route.params.id)
+  },
   methods: {
-    submitForm(formName) {
+    submitForm(formName) { // 提交
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          alert('submit!')
+          this.updateBuilding()
         } else {
           console.log('error submit!!')
           return false
         }
       })
     },
-    resetForm(formName) {
+    resetForm(formName) { // 重置
       this.$refs[formName].resetFields()
+    },
+    updateBuilding() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('UpdateBuilding', this.ruleForm).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'building-index', params: { listQuery: this.listQuery }})
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error AddBuilding')
+      })
+    },
+    getById(buildingId) { // 根据楼栋信息 id 查询楼栋信息
+      this.$store.dispatch('GetByIdBuildingId', buildingId).then((res) => {
+        const data = res.data
+        this.ruleForm.id = data.id
+        this.ruleForm.building = data.building
+        this.ruleForm.unit = data.unit
+        this.ruleForm.level = data.level
+        this.ruleForm.roomNo = data.roomNo
+        this.ruleForm.ownerName = data.ownerName
+        this.ruleForm.ownerTel = data.ownerTel
+      }).catch(() => {
+        console.log('error GetByIdBuildingId')
+      })
+    },
+    backIndex() { // 返回楼栋信息列表
+      this.$router.push({ name: 'building-index', params: { listQuery: this.listQuery }})
     }
   }
 }
 </script>
 
 <style scoped>
-
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
 </style>

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

@@ -36,19 +36,19 @@
             :value="item.roomNo"/>
         </el-select>
         <el-form-item label="业主名称">
-          <el-input placeholder="业主名称" />
+          <el-input v-model="listQuery.ownerName" placeholder="业主名称" />
         </el-form-item>
       </el-form-item>
       <el-form-item>
-        <el-button type="info">清空</el-button>
-        <el-button type="primary" @click="dataQuery">查询</el-button>
+        <el-button type="info" @click="emptyListQuery">清空</el-button>
+        <el-button type="primary" @click="conditionsQuery">查询</el-button>
       </el-form-item>
     </el-form>
     <div class="operation">
       <div>
-        <el-button type="primary">添加</el-button>
-        <el-button type="warning">修改</el-button>
-        <el-button type="danger">删除</el-button>
+        <el-button type="primary" @click="addBuilding">添加</el-button>
+        <el-button type="warning" @click="ediBuilding(-1)">修改</el-button>
+        <el-button type="danger" @click="deleteData">删除</el-button>
       </div>
       <div>
         <el-button type="success" @click="dialogBatchImport">批量导入楼栋信息</el-button>
@@ -70,7 +70,7 @@
       <el-table-column prop="ownerName" label="业主姓名"/>
       <el-table-column prop="ownerTel" label="手机号码" />
       <el-table-column prop="pairStatus" label="关联业主状态" >
-        <template slot-scope="scope">{{ scope.row.pairStatus === 1 ? '已关联':'未管理' }}</template>
+        <template slot-scope="scope">{{ scope.row.pairStatus === '1' ? '已关联':'未关联' }}</template>
       </el-table-column>
       <el-table-column prop="createDate" label="创建时间" />
     </el-table>
@@ -79,7 +79,7 @@
         :current-page="listQuery.pageNum"
         :page-sizes="[10, 20, 50, 100]"
         :page-size="listQuery.pageSize"
-        :total="400"
+        :total="total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
@@ -102,13 +102,14 @@ export default {
         pageNum: 1,
         pageSize: 10
       },
-      total: '', // 数据总数
+      total: 0, // 数据总数
       buildingInfoLists: [],
       buildingList: [],
       unitList: [],
       levelList: [],
       roomNoList: [],
-      listLoading: true // 加载圈
+      listLoading: true, // 加载圈
+      deleteIds: [] // 需要删除的id集合
     }
   },
   computed: {
@@ -125,9 +126,14 @@ export default {
     }
   },
   mounted() {
-    console.log('获取楼栋')
     // 获取栋
     this.getBuild()
+
+    const query = this.$route.params.listQuery
+    if (query !== undefined) {
+      this.listQuery = query
+    }
+
     // 获取数据
     this.dataQuery()
   },
@@ -138,21 +144,32 @@ export default {
     ]),
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.listQuery.pageNum = 1
+      // 获取数据
+      this.dataQuery()
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      // 获取数据
+      this.dataQuery()
     },
     dialogBatchImport() {
       this.$router.push({ name: 'batch-import' })
     },
-    handleSelectionChange(data) {
-
+    handleSelectionChange(data) { // 表格多选框
+      console.log('多选框的值:', data)
+      // 设置为 空
+      this.deleteIds = []
+      for (let i = 0; i < data.length; i++) {
+        this.deleteIds.push(data[i].id)
+      }
     },
     getBuild() { // 获取楼栋
       this.listQuery.building = ''
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.buildingList = res.data
-        // console.log(res)
       }).catch(() => {
         console.log('error BuildingAddress')
       })
@@ -161,7 +178,6 @@ export default {
       this.listQuery.unit = ''
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.unitList = res.data
-        console.log(res)
       }).catch(() => {
         console.log('error BuildingAddress')
       })
@@ -170,7 +186,6 @@ export default {
       this.listQuery.level = ''
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.levelList = res.data
-        console.log(res)
       }).catch(() => {
         console.log('error BuildingAddress')
       })
@@ -179,7 +194,6 @@ export default {
       this.listQuery.roomNo = ''
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.roomNoList = res.data
-        console.log(res)
       }).catch(() => {
         console.log('error BuildingAddress')
       })
@@ -197,20 +211,67 @@ export default {
           break
       }
     },
+    conditionsQuery() { // 条件查询
+      this.listQuery.pageNum = 1
+      this.dataQuery()
+    },
     dataQuery() { // 查询数据
       this.listLoading = true
-      // this.BuildingInfoList(this.listQuery).then((res) => {
-      //   this.listLoading = false
-      // }).catch(() => {
-      //   console.log('get UserCommunity list error')
-      // })
       this.$store.dispatch('BuildingInfoList', this.listQuery).then((res) => {
-        this.$data.buildingInfoLists = res.data
+        const resData = res.data
+        this.buildingInfoLists = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = resData.pageSize
+        this.total = resData.total
         this.listLoading = false
       }).catch(() => {
         this.listLoading = false
         console.log('error BuildingInfoList')
       })
+    },
+    emptyListQuery() { // 清空按钮
+      this.listQuery.building = ''
+      this.listQuery.unit = ''
+      this.listQuery.level = ''
+      this.listQuery.roomNo = ''
+      this.listQuery.ownerName = ''
+      this.listQuery.pageNum = 1
+      // 获取数据
+      this.dataQuery()
+    },
+    deleteData() { // 删除
+      this.$confirm('您确定要删除吗?')
+        .then(_ => {
+          this.$store.dispatch('DeleteBuilding', this.deleteIds).then((res) => {
+            if (res.code === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              // 获取数据
+              this.dataQuery()
+              return
+            }
+            this.$message.error(res.message)
+          }).catch(() => {
+            console.log('error deleteBuilding')
+          })
+        }).catch(_ => {})
+    },
+    addBuilding() { // 添加楼栋业主信息资料
+      this.$router.push({ name: 'building-add' })
+    },
+    ediBuilding(buildId) { // 修改楼栋业主信息资料
+      const ids = this.deleteIds
+      if (ids.length > 1) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }
+      if (ids < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
+      this.$router.push({ name: 'building-edi', params: { id: ids[0], listQuery: this.listQuery }})
     }
   }
 }