合并

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

@@ -19,7 +19,7 @@ import javax.servlet.http.HttpSession;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "人脸相关API", description = "人脸相关API")
-public class FaceController {
+public class FaceController extends BaseController {
     @Autowired
     private FaceServiceI faceServicel;
 
@@ -34,9 +34,8 @@ public class FaceController {
                             @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
                             @RequestParam(required = false) Integer otherUserId){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        responseBean = faceServicel.addFace(userId ,uploadFile,otherUserId);
+        UserElement userElement = getUserElement(session);
+        responseBean = faceServicel.addFace(userElement ,uploadFile,otherUserId);
         return responseBean;
     }
 
@@ -51,9 +50,8 @@ public class FaceController {
                                @RequestParam(required = false) Integer otherUserId
                                ){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-         responseBean = faceServicel.upDateFace(userId,uploadFile,otherUserId);
+        UserElement userElement = getUserElement(session);
+         responseBean = faceServicel.upDateFace(userElement,uploadFile,otherUserId);
         return responseBean;
     }
 
@@ -64,9 +62,8 @@ public class FaceController {
     })
     @RequestMapping(value = "/getUserIdFace",method = RequestMethod.GET)
     public Object getTaFaceByUserId(HttpSession session, @RequestParam(required = false) Integer otherUserId){
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userId,otherUserId);
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userElement,otherUserId);
         return responseBean;
     }
 

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

@@ -19,10 +19,10 @@ public interface TaFaceMapper{
 
     /**
      * 查看当前用户信息
-     * @param userid
+     * @param userVerifyId
      * @return
      */
-    TaFace getByUserId(@Param("userid") Integer userid);
+    TaFace getByUserVerifyId(@Param("userVerifyId") Integer userVerifyId);
 
     /**
      * 查看当前信息

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

@@ -19,9 +19,9 @@ public class TaFace {
     private Integer communityId;
 
     /**
-     * 用户ID
+     * 用户审核 ID
      */
-    private Integer taUserId;
+    private Integer taUserVerifyId;
 
     /**
      *图片

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

@@ -9,28 +9,29 @@ import org.springframework.web.multipart.MultipartFile;
 public interface FaceServiceI {
     /**
      * 添加人脸
-     * @param userId 登入人ID
+     * @param userElement 登入人ID
      *  @param  uploadFile
      *  @param otherUserId 关联家属或者租客ID
      * @return
      */
-    ResponseBean addFace(Integer userId ,MultipartFile uploadFile,Integer otherUserId);
+    ResponseBean addFace(UserElement userElement, MultipartFile uploadFile,Integer otherUserId);
 
     /**
      * 更新当前人脸
-     * @param userId 登入人ID
+     * @param userElement 登入人ID
      *  @param  uploadFile
      *  @param otherUserId 关联家属或者租客ID
      * @return
      */
-    ResponseBean upDateFace(Integer userId ,MultipartFile uploadFile,Integer otherUserId);
+    ResponseBean upDateFace(UserElement userElement, MultipartFile uploadFile,Integer otherUserId);
 
     /**
      * 当前登入人是否有人脸信息
-     * @param userId
+     * @param userElement
+     * @param otherUserId
      * @return
      */
-    ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserId);
+    ResponseBean getTaFaceByUserId(UserElement userElement,Integer otherUserId);
 
     /**
      * 迎宾人员 添加人脸

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

@@ -20,8 +20,8 @@ public interface ITaUserService {
      * 校验 用户认证状态
      * @param user
      */
-    default void checkVerifyStatusUser(TaUser user) {
-        if (Constant.INVALID_VERIFY_STATUS.equals(user.getVerifyStatus())) {
+    default void checkBlacklistStatusUser(TaUser user) {
+        if (Constant.BLACKLIST_STATUS.equals(user.getStatus())) {
             throw new WisdomException("关联账户违反社区规定，无法使用");
         }
     }

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

@@ -1,4 +1,5 @@
 package com.community.huiju.service.impl;
+
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.ailiyun.AESDecode;
 import com.community.commom.constant.Constant;
@@ -9,10 +10,12 @@ import com.community.huiju.common.welcome.WelcomeProperties;
 import com.community.huiju.dao.TaFaceMapper;
 import com.community.huiju.dao.TaSysRoleMapper;
 import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.dao.TaUserVerifyMapper;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.TaFace;
 import com.community.huiju.model.TaSysRole;
 import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserVerify;
 import com.community.huiju.service.FaceServiceI;
 import com.community.huiju.service.ImageServiceI;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -51,10 +55,13 @@ public class FaceServicelimpl implements FaceServiceI {
     @Autowired
     private WelcomeProperties welcomeProperties;
 
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean addFace(Integer userid, MultipartFile uploadFile,Integer otherUserId) {
-        ResponseBean responseBean= new ResponseBean();
+    public ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId) {
+        ResponseBean responseBean = new ResponseBean();
 
         // 判断是否是迎宾系统人员
         TaUser welcomeUser = taUserMapper.selectByPrimaryKey(otherUserId);
@@ -64,65 +71,64 @@ public class FaceServicelimpl implements FaceServiceI {
             return responseBean;
         }
 
+        // 当前人脸图片url
+        String faceImg = img(uploadFile);
+        // 房产审核id
+        Integer userVerifyId = userElement.getUserVerifyId();
 
-         String faceImg =img(uploadFile);
         /**当otherUserId不为空时判断它是否是业主下的租客或者家属*/
-        if (null!= otherUserId) {
-                 responseBean = getTaFaceParentId(userid, otherUserId);
-            if ("1".equals(responseBean.getCode())){
-                responseBean.getMessage();
-                return responseBean;
-            }
+        if (null != otherUserId) {
+            TaUserVerify otherUserVerify = getTaFaceParentId(userElement, otherUserId);
+            userVerifyId = otherUserVerify.getId();
         }
-            Integer activeUser = otherUserId == null?userid:otherUserId;
-            TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
-            TaFace taFace = new TaFace();
-            taFace.setFaceImg(faceImg);
-            taFace.setCommunityId(user.getCommunityId());
-            taFace.setTaUserId(activeUser);
-            taFace.setCreateUser(userid);
-            taFace.setUpdateUser(activeUser);
-            taFace.setCreateDate(new Date());
-            taFace.setUpdateDate(new Date());
+        Integer activeUser = otherUserId == null ? userElement.getId() : otherUserId;
+        TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
+        TaFace taFace = new TaFace();
+        taFace.setFaceImg(faceImg);
+        taFace.setCommunityId(user.getCommunityId());
+        taFace.setTaUserVerifyId(userVerifyId);
+        taFace.setCreateUser(userElement.getId());
+        taFace.setUpdateUser(activeUser);
+        taFace.setCreateDate(new Date());
+        taFace.setUpdateDate(new Date());
 
         /*验证身份*/
-        responseBean=addVerify( activeUser,  uploadFile, faceImg, taFace) ;
+        responseBean = addVerify(activeUser, userVerifyId, uploadFile, faceImg, taFace);
         return responseBean;
     }
 
     /**
      * 修改人脸信息
-      * @param userId 登入人ID
-     * @param  uploadFile
+     *
+     * @param userElement 登入人ID
+     * @param uploadFile
      * @param otherUserId 关联家属或者租客ID
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile,Integer otherUserId) {
-        boolean isA = false;
-      ResponseBean responseBean= new ResponseBean();
-        String faceImg =img(uploadFile);
-        if (null!= otherUserId) {
-                 responseBean = getTaFaceParentId(userId, otherUserId);
-            if ("1".equals(responseBean.getCode())) {
-                responseBean.getMessage();
-                return responseBean;
-               }}
-            Integer activeUser = otherUserId == null?userId:otherUserId;
-            //当前修改的id否存在
-             TaFace face = taFaceMapper.getByUserId(activeUser);
-             if (null == face){
-                 responseBean.addError("您的信息不存在，请录入人脸");
-                 return responseBean;
-             }
-           TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
-            TaFace taFace = new TaFace();
-            taFace.setTaUserId(activeUser);
-            taFace.setFaceImg(faceImg);
-            taFace.setUpdateUser(userId);
-            taFace.setUpdateDate(new Date());
-            ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, activeUser);
+    public ResponseBean upDateFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId) {
+        ResponseBean responseBean = new ResponseBean();
+        // 人脸图片地址url
+        String faceImg = img(uploadFile);
+        // 房产 审核id
+        Integer userVerifyId = userElement.getUserVerifyId();
+        if (null != otherUserId) {
+            TaUserVerify otherUserVerify = getTaFaceParentId(userElement, otherUserId);
+            userVerifyId = otherUserVerify.getId();
+        }
+        Integer activeUser = otherUserId == null ? userElement.getId() : otherUserId;
+        //当前修改的id否存在
+        TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
+        if (null == face) {
+            responseBean.addError("您的信息不存在，请录入人脸");
+            return responseBean;
+        }
+        face.setTaUserVerifyId(userVerifyId);
+        face.setFaceImg(faceImg);
+        face.setUpdateUser(userElement.getId());
+        face.setUpdateDate(new Date());
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser);
         if (resps.getCode().equals("0")) {
             resps.addSuccess((Object) faceImg);
         } else {
@@ -132,7 +138,7 @@ public class FaceServicelimpl implements FaceServiceI {
     }
 
     /**
-     *验证图片是否为人脸，推送海康
+     * 验证图片是否为人脸，推送海康
      */
     public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
@@ -145,88 +151,88 @@ public class FaceServicelimpl implements FaceServiceI {
         AESDecode aesd = new AESDecode();
         String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
         try {
-                responseBean = aesd.send(body);
-                JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
-                Integer type = (Integer) jsonObject.get("errno");
-                Integer faceNum = (Integer) jsonObject.get("face_num");
-
-             /*推送海康*/
-            String data=HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo());
-              /*boolean isA为true进行添加，为false进行修改*/
+            responseBean = aesd.send(body);
+            JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
+            Integer type = (Integer) jsonObject.get("errno");
+            Integer faceNum = (Integer) jsonObject.get("face_num");
+
+            /*推送海康*/
+            String data = HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo());
+            /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
                     throw new RuntimeException("海康人脸推送失敗！");
                 }
                 if (isA) {
                     taFaceMapper.insertSelective(taFace);
-                }else {
+                } else {
                     taFaceMapper.updateByPrimaryKeySelective(taFace);
                 }
                 responseBean.addSuccess("操作成功");
                 HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
                 //可视对讲时 指定人员人脸权限下载
-                List<Integer> userIdList= new ArrayList<>();
+                List<Integer> userIdList = new ArrayList<>();
                 userIdList.add(user.getHkUserId());
                 //临时设备编号
                 // TODO 根据期楼栋号，来查询出门口机
-                List<String> visualList= new ArrayList<>();
+                List<String> visualList = new ArrayList<>();
                 visualList.add("10010100000");
-                HKOpenApi.visualIntercom(null,1,userIdList,visualList);
-            }else {
+                HKOpenApi.visualIntercom(null, 1, userIdList, visualList);
+            } else {
                 responseBean.addError("请录入正确图片");
             }
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("海康人脸推送失敗！ {}",e);
+            log.error("海康人脸推送失敗！ {}", e);
             throw new RuntimeException("海康人脸推送失敗！");
         }
         return responseBean;
     }
 
     /**
-     *获得用户，租客，家属，其中一种身份的信息
+     * 当前登入人是否有人脸信息
      */
     @Override
-    public ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserId) {
-        ResponseBean responseBean= new ResponseBean();
+    public ResponseBean getTaFaceByUserId(UserElement userElement, Integer otherUserId) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer userVerifyId = userElement.getUserVerifyId();
+
         /**当otherUserId不为空时判断它是否是业主下的租客或者家属*/
-        if (null!= otherUserId) {
-            responseBean = getTaFaceParentId(userId, otherUserId);
-            if ("1".equals(responseBean.getCode())) {
-                responseBean.getMessage();
-                return responseBean;
-            }
+        if (null != otherUserId) {
+            TaUserVerify userVerify = getTaFaceParentId(userElement, otherUserId);
+            userVerifyId = userVerify.getId();
         }
-        Integer id = otherUserId == null?userId:otherUserId;
-        TaFace face = taFaceMapper.getByUserId(id);
-         if (null!= face){
+        TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
+        if (null != face) {
             responseBean.addSuccess(face);
             return responseBean;
         }
-            responseBean.addError("当前用户暂无人脸图片");
-            return responseBean;
+        responseBean.addError("当前用户暂无人脸图片");
+        return responseBean;
 
     }
 
     /**
-     *判断当前用户下的人员关系（家属，租客）
+     * 判断当前用户下的人员关系（家属，租客）
      */
-    public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserId){
-        ResponseBean  responseBean= new ResponseBean();
-        TaUser  users= taUserMapper.selectByPrimaryKey(otherUserId);
-        if (null == users || !userId.equals(users.getParentId())){
-                responseBean.addError("您输入的家属或租户ID有误");
-
-        }else if (userId.equals(otherUserId)){
-               responseBean.addError("您输入的家属或租户ID有误");
+    public TaUserVerify getTaFaceParentId(UserElement userElement, Integer otherUserId) {
+        // 根据 家属/租客 的id， 和 当前的房产信息进行查询是否有值，有值就说明是 家属/租客
+        TaUserVerify todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(otherUserId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
+        // 判断 家属或者租客 属不属于这个业主的下面
+        if (null == todUserVerify) {
+            throw new WisdomException("您输入的家属或租户ID有误");
         }
-        return responseBean;
+        if (!Constant.VERIFY_STATUS.equals(todUserVerify.getVerifyStatus())) {
+            throw new WisdomException("用户房产审核未通过！");
+        }
+
+        return todUserVerify;
     }
 
     /**
      * 得到当前图片
      */
-    private String img(MultipartFile uploadFile){
+    private String img(MultipartFile uploadFile) {
         String faceImg = null;
         try {
             faceImg = imageServiceI.getImageUrl(uploadFile);
@@ -237,50 +243,34 @@ public class FaceServicelimpl implements FaceServiceI {
     }
 
     /**
-     *各种身份校验
+     * 各种身份校验
      */
-    public ResponseBean addVerify(Integer userid, MultipartFile uploadFile,String faceImg,TaFace taFace) {
+    public ResponseBean addVerify(Integer userid, Integer userVerifyId, MultipartFile uploadFile, String faceImg, TaFace taFace) {
         ResponseBean response = new ResponseBean();
-        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
+
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
         TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
-        if (null!=taUser && null!=sysRole
-                && Constant.INVALID.equals(taUser.getStatus())&& Constant.OWNER.equals(sysRole.getRoleName())) {
+
+        //身份为家属租客，状态为已停用
+        if (null != taUser && !Constant.EFFECTIVE_STATUS.equals(taUser.getStatus())) {
             response.addError("9996", "您的身份已停用，请联系物业");
             return response;
         }
-        //身份为家属租客，状态为已停用
-        if (null!=taUser && null!=sysRole){
-            if (Constant.INVALID.equals(taUser.getStatus()) && ((Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName()))){
-                response.addError("9996", "您的身份已停用，请联系物业");
-                return response;
-            }
-        }
+
         //查询当前用户是否有人脸记录
-        TaFace User = taFaceMapper.getByUserId(userid);
-        if (null == User) {
+        TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
+        if (null == face) {
             boolean isA = true;
-            if (Constant.OWNER.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
-                ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userid);
-                if (resps.getCode().equals("0")) {
-                    taUser.setFaceStatus("1");
-                    taUserMapper.updateByPrimaryKeySelective(taUser);
-                    resps.addSuccess("图片录入成功");
-                } else {
-                    resps.addError(resps.getMessage());
-                }
-                return resps;
-            }
-            //家属或者租客，已认证
-            if (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
-                ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userid);
-                if (resps.getCode().equals("0")) {
+            if (Constant.EFFECTIVE_STATUS.equals(taUser.getStatus()) && "1".equals(taUser.getVerifyStatus())) {
+                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid);
+                if (responseBean.getCode().equals("0")) {
                     taUser.setFaceStatus("1");
                     taUserMapper.updateByPrimaryKeySelective(taUser);
-                    resps.addSuccess("图片录入成功");
+                    responseBean.addSuccess("图片录入成功");
                 } else {
-                    resps.addError(resps.getMessage());
+                    responseBean.addError(responseBean.getMessage());
                 }
-                return resps;
+                return responseBean;
             }
         }
         response.addError("您的信息已存在");
@@ -313,9 +303,9 @@ public class FaceServicelimpl implements FaceServiceI {
         }
 
         JSONObject jsonObject = JSONObject.parseObject(result);
-        if (!jsonObject.get("code").equals(200)){
+        if (!jsonObject.get("code").equals(200)) {
             String message = jsonObject.get("message").toString();
-            log.error(" 推送 迎宾系统失败！ {}",message);
+            log.error(" 推送 迎宾系统失败！ {}", message);
             throw new WisdomException(message);
         }
 
@@ -324,7 +314,7 @@ public class FaceServicelimpl implements FaceServiceI {
         taFace.setCommunityId(user.getCommunityId());
         taFace.setCreateDate(new Date());
         taFace.setCreateUser(user.getId());
-        taFace.setTaUserId(user.getId());
+        //taFace.setTaUserId(user.getId());
         taFace.setUpdateDate(new Date());
         taFace.setUpdateUser(user.getId());
         try {

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

@@ -114,19 +114,21 @@ public class TaUserServiceImpl implements ITaUserService {
         }
 
         // 校验用户
-        checkVerifyStatusUser(currentUser);
+        checkBlacklistStatusUser(currentUser);
+
+        TaUserVO taUserVO = new TaUserVO();
+        BeanUtils.copyProperties(currentUser, taUserVO);
 
         // 校验房产
         List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectByUserId(currentUser.getId());
         // 无关联房产
         if (null == taUserVerifies || taUserVerifies.size() == 0) {
-            response.addSuccess(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode(), UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg());
+            response.addSuccess(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode(), UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO);
             return response;
         }
-        TaUserVO taUserVO = new TaUserVO();
+
         // 关联一个审核通过的房产/关联一个待审核房产/关联一个审核未通过房产
         if (taUserVerifies.size() == 1) {
-            BeanUtils.copyProperties(currentUser, taUserVO);
             TaUserVerify userVerify = taUserVerifies.get(0);
 
             /**
@@ -136,7 +138,6 @@ public class TaUserServiceImpl implements ITaUserService {
 
             return checkHouse(response, taUserVO, userVerify);
         } else if (taUserVerifies.size() >= 2) {
-            BeanUtils.copyProperties(currentUser, taUserVO);
             response.addSuccess(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode(), taUserVO);
             return response;
         }
@@ -791,6 +792,10 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("用户不存在！");
             return response;
         }
+
+        // 校验用户
+        checkBlacklistStatusUser(user);
+
         // 当 解除了这个房产关联关系的时候，就不能获取到用户信息
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
         if (null == userVerify) {
@@ -800,13 +805,13 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 查询 家属或者租客
         if (null != userId) {
-            TaUser todUser = taUserMapper.selectByPrimaryKey(userId);
             TaUserVerify todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
             // 判断 家属或者租客 属不属于这个业主的下面
             if (null == todUserVerify) {
                 response.addError("您的下面没有该家属或者租客!");
                 return response;
             }
+            TaUser todUser = taUserMapper.selectByPrimaryKey(userId);
             user = todUser;
         }
 
@@ -848,8 +853,8 @@ public class TaUserServiceImpl implements ITaUserService {
         setUserVoProperties(user.getCommunityId(), userVO);
 
         // 人脸是否已录入
-        // 这里目前定死为已录入, 后期根据人脸业务做判断
-        if ("1".equals(user.getFaceStatus())) {
+        TaFace face = taFaceMapper.getByUserVerifyId(userVerify.getId());
+        if (null == face) {
             userVO.setFace("register");
         } else {
             userVO.setFace("unregister");
@@ -967,6 +972,13 @@ public class TaUserServiceImpl implements ITaUserService {
             taUserVO.setRoomNoId(userVerify.getRoomNoId());
             taUserVO.setAddressBuilding(userVerify.getPhaseName() + userVerify.getBuildingName() + userVerify.getUnitName() + userVerify.getLevelName() + userVerify.getRoomNoName());
 
+            // 人脸是否已录入
+            TaFace face = taFaceMapper.getByUserVerifyId(userVerify.getId());
+            if (null == face) {
+                taUserVO.setFace("register");
+            } else {
+                taUserVO.setFace("unregister");
+            }
 
             TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
             taUserVO.setRole(taSysRole.getRoleName());

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

@@ -4,7 +4,7 @@
     <resultMap id="BaseResultMap" type="com.community.huiju.model.TaFace" >
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="community_id" property="communityId" jdbcType="INTEGER" />
-        <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+        <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
         <result column="face_img" property="faceImg" jdbcType="VARCHAR" />
         <result column="create_user" property="createUser" jdbcType="INTEGER" />
         <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
@@ -12,7 +12,7 @@
         <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     </resultMap>
     <sql id="Base_Column_List" >
-        id, community_id,ta_user_id,face_img,create_user, create_date, update_user,
+        id, community_id,ta_user_verify_id,face_img,create_user, create_date, update_user,
         update_date
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap">
@@ -26,9 +26,9 @@
         where id = #{id,jdbcType=INTEGER}
     </delete>
     <insert id="insert" parameterType="com.community.huiju.model.TaFace" >
-        insert into ta_face (id, community_id, ta_user_id,face_img, create_user, create_date,
+        insert into ta_face (id, community_id, ta_user_verify_id,face_img, create_user, create_date,
         update_user, update_date)
-        values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},#{taUserId,jdbcType=INTEGER},#{faceImg,jdbcType=VARCHAR},#{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
+        values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},#{taUserVerifyId,jdbcType=INTEGER},#{faceImg,jdbcType=VARCHAR},#{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
         #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
     </insert>
     <insert id="insertSelective"  parameterType="com.community.huiju.model.TaFace" >
@@ -40,8 +40,8 @@
             <if test="communityId != null" >
                 community_id,
             </if>
-            <if test="taUserId != null" >
-                ta_user_id,
+            <if test="taUserVerifyId != null" >
+                ta_user_verify_id,
             </if>
             <if test="faceImg != null" >
                 face_img,
@@ -66,8 +66,8 @@
             <if test="communityId != null" >
                 #{communityId,jdbcType=INTEGER},
             </if>
-            <if test="taUserId != null" >
-                #{taUserId,jdbcType=INTEGER},
+            <if test="taUserVerifyId != null" >
+                #{taUserVerifyId,jdbcType=INTEGER},
             </if>
             <if test="faceImg != null" >
                 #{faceImg,jdbcType=VARCHAR},
@@ -92,6 +92,9 @@
             <if test="communityId != null" >
                 community_id = #{communityId,jdbcType=INTEGER},
             </if>
+            <if test="taUserVerifyId != null" >
+                ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+            </if>
             <if test="faceImg != null" >
                 face_img = #{faceImg,jdbcType=VARCHAR},
             </if>
@@ -108,14 +111,14 @@
                 update_date = #{updateDate,jdbcType=TIMESTAMP},
             </if>
         </set>
-        where ta_user_id = #{taUserId,jdbcType=INTEGER}
+        where id = #{id,jdbcType=INTEGER}
     </update>
 
-    <select id="getByUserId" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+    <select id="getByUserVerifyId" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
         <include refid="Base_Column_List" />
         from ta_face
-        where ta_user_id = #{userid,jdbcType=INTEGER}
+        where ta_user_verify_id = #{userVerifyId,jdbcType=INTEGER}
     </select>
 
     <select id="getById" resultMap="BaseResultMap"  parameterType="java.lang.Integer" >

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

@@ -204,4 +204,19 @@ public class Constant {
      * 认证作废
      */
     public static final String INVALID_VERIFY_STATUS = "3";
+
+    /**
+     * 人员状态  拉黑 (运营端操作 APP端的用户)
+     */
+    public static final String BLACKLIST_STATUS = "2";
+
+    /**
+     * 人员状态  有效
+     */
+    public static final String EFFECTIVE_STATUS = "1";
+
+    /**
+     * 人员状态  无效
+     */
+    public static final String INVALID_STATUS = "0";
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/TaUserController.java

@@ -0,0 +1,58 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.service.ITaUserService;
+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.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 移动端 用户
+ */
+@RestController
+@RequestMapping("/")
+@RefreshScope
+@Api(value = "移动用户API",description = "移动用户API")
+public class TaUserController  extends BaseController {
+
+    @Autowired
+    private ITaUserService iTaUserService;
+
+    @ApiOperation("查询所有用户")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "userName", value = "用户名"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "loginName", value = "手机号"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "idCard", value = "身份证"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "当前页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "一页多少行"),
+    })
+    @RequestMapping(value = "/ta/user/getAll", method = RequestMethod.GET)
+    public ResponseBean getAll(@RequestParam(value = "userName", required = false) String userName,
+                               @RequestParam(value = "loginName", required = false)String loginName,
+                               @RequestParam(value = "idCard", required = false)String idCard,
+                               @RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
+                               @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.getAll(userName, loginName, idCard, pageNum, pageSize);
+        return responseBean;
+    }
+
+    @ApiOperation("拉黑用户")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "ids", value = "id集合"),
+    })
+    @RequestMapping(value = "/ta/user/blacklist", method = RequestMethod.PUT)
+    public ResponseBean blacklistTaUser(@RequestBody List<Integer> ids) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.blacklistTaUser(ids);
+        return responseBean;
+    }
+
+}

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

@@ -3,6 +3,8 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TaUser;
 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;
 import java.util.Map;
@@ -82,4 +84,10 @@ public interface TaUserMapper {
      * @return
      */
     Integer getOwnerCount();
+
+    /**
+     * 查询所有用户列表
+     * @return
+     */
+    List<TaUser> selectAll(String userName, String loginName, String idCard);
 }

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

@@ -39,6 +39,13 @@ public class TaUser {
 
     private Date updateDate;
 
+    // 身份证
+    private String idCard;
+
+    private String openid;
+
+    private String nickname;
+
     /**
      * 海康人员编号
      */
@@ -250,4 +257,28 @@ public class TaUser {
     public void setHkPersonNo(Long hkPersonNo) {
         this.hkPersonNo = hkPersonNo;
     }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
 }

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

@@ -2,6 +2,8 @@ package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
 
+import java.util.List;
+
 public interface ITaUserService {
 
     /**
@@ -12,4 +14,22 @@ public interface ITaUserService {
      */
     ResponseBean getByUserTypeCount();
 
+    /**
+     * 查询所有的 用户
+     * @param userName
+     * @param loginName
+     * @param idCard
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getAll(String userName, String loginName, String idCard, Integer pageNum, Integer pageSize);
+
+    /**
+     * 批量拉黑用户
+     * @param ids
+     * @return
+     */
+    ResponseBean blacklistTaUser(List<Integer> ids);
+
 }

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

@@ -2,11 +2,16 @@ package com.community.huiju.service.impl;
 
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.service.ITaUserService;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -47,4 +52,37 @@ public class TaUserServiceImpl implements ITaUserService {
         return responseBean;
     }
 
+    @Override
+    public ResponseBean getAll(String userName, String loginName, String idCard, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Page<TaUser> page = PageHelper.startPage(pageNum, pageSize);
+        List<TaUser> userList = taUserMapper.selectAll(userName, loginName, idCard);
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("item", userList);
+        map.put("total", page.getTotal());
+        map.put("pageNum", page.getPageNum());
+        map.put("pageSize", page.getPageSize());
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean blacklistTaUser(List<Integer> ids) {
+        ResponseBean responseBean = new ResponseBean();
+
+        ids.forEach(e -> {
+            TaUser user = taUserMapper.selectByPrimaryKey(e);
+            if (null == user) {
+                throw new WisdomException("用户不存在");
+            }
+            user.setStatus("2");
+            taUserMapper.updateByPrimaryKeySelective(user);
+        });
+
+        responseBean.addSuccess("操作成功");
+        return responseBean;
+    }
 }

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

@@ -24,11 +24,14 @@
     <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
     <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
     <result column="face_status" property="faceStatus" jdbcType="CHAR" />
+    <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
+    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
@@ -47,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
+      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},
@@ -55,7 +58,8 @@
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
-      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
+      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR},
+      #{idCard,jdbcType=VARCHAR}, #{openid,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR},
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
@@ -127,6 +131,15 @@
       <if test="faceStatus != null" >
         face_status,
       </if>
+      <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" >
@@ -195,6 +208,15 @@
       <if test="faceStatus != null" >
         #{faceStatus,jdbcType=CHAR},
       </if>
+      <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" >
@@ -263,6 +285,15 @@
       <if test="faceStatus != null" >
         face_status = #{faceStatus,jdbcType=CHAR},
       </if>
+      <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>
@@ -288,7 +319,10 @@
       hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
       hk_user_id = #{hkUserId,jdbcType=INTEGER},
       hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
-      face_status = #{faceStatus,jdbcType=CHAR}
+      face_status = #{faceStatus,jdbcType=CHAR},
+      id_card = #{idCard,jdbcType=VARCHAR},
+      openid = #{openid,jdbcType=VARCHAR},
+      nickname = #{nickname,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -357,4 +391,24 @@
     INNER JOIN ta_sys_user_role tsur on tu.id = tsur.user_id where tsur.role_id != 2
   </select>
 
+  <select id="selectAll" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List"/>
+    from ta_user
+    <where>
+      <trim suffixOverrides="or | and">
+        <if test="userName != null and userName != ''" >
+          and user_name like CONCAT('%', #{userName,jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="loginName != null and loginName != ''" >
+          and login_name like CONCAT('%', #{loginName,jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="idCard != null and idCard != ''">
+          and id_card like CONCAT('%', #{idCard,jdbcType=VARCHAR}, '%')
+        </if>
+        and id != -1
+      </trim>
+    </where>
+  </select>
+
 </mapper>

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

@@ -42,9 +42,9 @@ public class BuildingOwnerInfoController extends BaseController {
 
     @ApiOperation(value = "获取楼栋业主信息", notes = "根据条件获取")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "building栋;" +
-                    "unit单元;level楼层;roomNo户号;" +
-                    "ownerName业主姓名;" +
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "buildingId栋;" +
+                    "unitId单元;levelId楼层;roomNoId户号;" +
+                    "ownerName业主姓名;" +"ownerTel业主手机号;" +"idCard身份证;" +
                     "pageNum第几页;pageSize 一页多少行;")
     })
     @RequestMapping(value = "/building/list", method = RequestMethod.POST)
@@ -123,7 +123,7 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
     
-    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiOperation(value = "查询 楼栋", notes = "查询 楼栋")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", name = "phaseId",value = "期区ID")
     })
@@ -135,7 +135,7 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
     
-    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiOperation(value = "查询 单元", notes = "查询 单元")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", name = "buildingId",value = "楼栋ID")
     })
@@ -147,7 +147,7 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
     
-    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiOperation(value = "查询 楼层", notes = "查询 楼层")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", name = "unitId",value = "单元ID")
     })
@@ -159,7 +159,7 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
     
-    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiOperation(value = "查询 房间号", notes = "查询 房间号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", name = "levelId",value = "楼层ID")
     })

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

@@ -29,4 +29,6 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
     int batchInsert(List<TpBuildingOwnerInfo> list);
 
     int batchUpdate(List<TpBuildingOwnerInfo> list);
+	
+	List<TpBuildingOwnerInfo> selectListByParams(Page page,@Param("tpBuildingOwnerInfo") TpBuildingOwnerInfo tpBuildingOwnerInfo);
 }

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

@@ -147,4 +147,10 @@ public class TpBuildingOwnerInfo implements Serializable {
      */
     @TableField(exist = false)
     private String roleName;
+    
+    /**
+     * 更新人
+     */
+    @TableField(exist = false)
+    private String updateName;
 }

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

@@ -98,44 +98,21 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         TpBuildingOwnerInfo tpBuildingOwnerInfo = jsonObject.toJavaObject(jsonObject,TpBuildingOwnerInfo.class);
-
+        tpBuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
         Long pageNum = jsonObject.getLong("pageNum") == null ? 1 : jsonObject.getLong("pageNum");
         Long pageSize = jsonObject.getLong("pageSize") == null ? 10 : jsonObject.getLong("pageSize");
 
-        Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
-
-        Map<String, Object> map = Maps.newHashMap();
-        // 小区Id
-        map.put("community_id", userElement.getCommunityId());
-        map.put("owner_status", "1");
-        // 期
-        //map.put("phase", tpBuildingOwnerInfo.getPhaseName());
-        // 栋
-        //map.put("building", tpBuildingOwnerInfo.getBuildingName());
-        // 单元
-        //map.put("unit", tpBuildingOwnerInfo.getUnitName());
-        // 楼层
-        //map.put("level", tpBuildingOwnerInfo.getLevelName());
-        // 房号
-        //map.put("room_no", tpBuildingOwnerInfo.getName());
-
-        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.allEq(map,false);
-        //queryWrapper.like(tpBuildingOwnerInfo.getOwnerName() != null,"owner_name", tpBuildingOwnerInfo.getOwnerName());
-        queryWrapper.orderByDesc("create_date");
+        Page page = new Page(pageNum,pageSize);
 
         // 分页查询
-        IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, queryWrapper);
-
+        List<TpBuildingOwnerInfo> list = tpBuildingOwnerInfoMapper.selectListByParams(page,tpBuildingOwnerInfo);
 
         Map<String, Object> retMap = Maps.newHashMap();
-        // 获取数据
-        List<TpBuildingOwnerInfo> list = infoIPage.getRecords();
 
         retMap.put("list", list);
-        retMap.put("total", infoIPage.getTotal());
-        retMap.put("pageNum", infoIPage.getCurrent());
-        retMap.put("pageSize", infoIPage.getSize());
+        retMap.put("total", page.getTotal());
+        retMap.put("pageNum", page.getCurrent());
+        retMap.put("pageSize", page.getSize());
 
         responseBean.addSuccess(retMap);
 
@@ -938,7 +915,19 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      */
     @Override
     public ResponseBean getBuildingList(Integer phaseId, Integer communityId) {
-        return null;
+        ResponseBean responseBean = new ResponseBean();
+        if (null == communityId || "".equals(communityId)) {
+            throw new WisdomException("编号:%s 小区不存在!", communityId);
+        }
+    
+        QueryWrapper<TpBuilding> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("community_id", communityId);
+        queryWrapper.eq("phase_id", phaseId);
+    
+        List<TpBuilding> tpBuildingList = tpBuildingMapper.selectList(queryWrapper);
+        responseBean.addSuccess(tpBuildingList);
+    
+        return responseBean;
     }
     
     /**
@@ -950,7 +939,19 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      */
     @Override
     public ResponseBean getUnitList(Integer buildingId, Integer communityId) {
-        return null;
+        ResponseBean responseBean = new ResponseBean();
+        if (null == communityId || "".equals(communityId)) {
+            throw new WisdomException("编号:%s 小区不存在!", communityId);
+        }
+    
+        QueryWrapper<TpUnit> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("community_id", communityId);
+        queryWrapper.eq("building_id", buildingId);
+    
+        List<TpUnit> tpUnitList = tpUnitMapper.selectList(queryWrapper);
+        responseBean.addSuccess(tpUnitList);
+    
+        return responseBean;
     }
     
     /**
@@ -962,7 +963,19 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      */
     @Override
     public ResponseBean getLevelList(Integer unitId, Integer communityId) {
-        return null;
+        ResponseBean responseBean = new ResponseBean();
+        if (null == communityId || "".equals(communityId)) {
+            throw new WisdomException("编号:%s 小区不存在!", communityId);
+        }
+    
+        QueryWrapper<TpLevel> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("community_id", communityId);
+        queryWrapper.eq("unit_id", unitId);
+    
+        List<TpLevel> tpLevelList = tpLevelMapper.selectList(queryWrapper);
+        responseBean.addSuccess(tpLevelList);
+    
+        return responseBean;
     }
     
     /**
@@ -974,6 +987,18 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      */
     @Override
     public ResponseBean getRoomNoList(Integer levelId, Integer communityId) {
-        return null;
+        ResponseBean responseBean = new ResponseBean();
+        if (null == communityId || "".equals(communityId)) {
+            throw new WisdomException("编号:%s 小区不存在!", communityId);
+        }
+    
+        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("community_id", communityId);
+        queryWrapper.eq("level_id", levelId);
+    
+        List<TpBuildingOwnerInfo> tpLevelList = tpBuildingOwnerInfoMapper.selectList(queryWrapper);
+        responseBean.addSuccess(tpLevelList);
+    
+        return responseBean;
     }
 }

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

@@ -58,4 +58,48 @@
         </foreach>
     </update>
 
+    <select id="selectListByParams" resultType="com.community.huiju.model.TpBuildingOwnerInfo">
+        SELECT
+            t.id,
+            t.community_id,
+            t.owner_tel,
+            t.owner_name,
+            t.id_card,
+            r.description as role_name,
+            u.verify_status,
+            m.user_name AS update_name,
+            t.update_date
+        FROM
+            tp_building_owner_info t
+            LEFT JOIN ta_user_verify u ON t.id = u.room_no_id
+            LEFT JOIN ta_sys_role r ON u.role_id = r.id
+            LEFT JOIN tp_user m ON t.update_user = m.id
+        WHERE
+            t.owner_status = 1
+        and t.community_id=#{tpBuildingOwnerInfo.communityId,jdbcType=INTEGER}
+        <if test="tpBuildingOwnerInfo.phaseId != null and tpBuildingOwnerInfo.phaseId != ''">
+            and t.phase_id = #{tpBuildingOwnerInfo.phaseId,jdbcType=INTEGER}
+        </if>
+        <if test="tpBuildingOwnerInfo.buildingId != null and tpBuildingOwnerInfo.buildingId != ''">
+            and t.building_id = #{tpBuildingOwnerInfo.buildingId,jdbcType=INTEGER}
+        </if>
+        <if test="tpBuildingOwnerInfo.unitId != null and tpBuildingOwnerInfo.unitId != ''">
+            and t.unit_id = #{tpBuildingOwnerInfo.unitId,jdbcType=INTEGER}
+        </if>
+        <if test="tpBuildingOwnerInfo.levelId != null and tpBuildingOwnerInfo.levelId != ''">
+            and t.level_id = #{tpBuildingOwnerInfo.levelId,jdbcType=INTEGER}
+        </if>
+        <if test="tpBuildingOwnerInfo.id != null and tpBuildingOwnerInfo.id != ''">
+            and t.id = #{tpBuildingOwnerInfo.id,jdbcType=INTEGER}
+        </if>
+        <if test="tpBuildingOwnerInfo.ownerName != null and tpBuildingOwnerInfo.ownerName != ''">
+            and t.owner_name like concat('%',#{tpBuildingOwnerInfo.ownerName,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="tpBuildingOwnerInfo.ownerTel != null and tpBuildingOwnerInfo.ownerTel != ''">
+            and t.owner_tel like concat('%',#{tpBuildingOwnerInfo.ownerTel,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="tpBuildingOwnerInfo.idCard != null and tpBuildingOwnerInfo.idCard != ''">
+            and t.id_card like concat('%',#{tpBuildingOwnerInfo.idCard,jdbcType=VARCHAR},'%')
+        </if>
+    </select>
 </mapper>

VUECODE/smart-operate-manage/src/api/user.js

@@ -79,3 +79,28 @@ export function upDateStatus(data) {
     }
   })
 }
+
+// 查询所有的 移动端用户
+export function getTaUserAll(data) {
+  return request({
+    url: '/ta/user/getAll',
+    method: 'get',
+    params: {
+      userName: data.userName, // 用户名
+      loginName: data.loginName, // 手机号
+      idCard: data.idCard, // 身份证号
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}
+
+// 拉黑 移动端用户用户
+export function blacklistUser(data) {
+  return request({
+    url: '/ta/user/blacklist',
+    method: 'put',
+    data
+  })
+}
+

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

@@ -35,6 +35,18 @@ export const constantRouterMap = [
         component: () => import('@/views/community/communityTable'),
         name: 'community',
         meta: { title: '社区列表', icon: 'community' }
+      },
+      {
+        path: '/user/management',
+        component: () => import('@/views/community/user/index'),
+        name: 'user-management',
+        meta: { title: '用户列表', icon: 'user' }
+      },
+      {
+        path: '/user/log',
+        component: () => import('@/views/community/user/log/index'),
+        name: 'user-log',
+        meta: { title: '用户日志', icon: 'user' }
       }
     ]
   },

VUECODE/smart-operate-manage/src/store/modules/user.js

@@ -1,6 +1,6 @@
 import { login, logOut, getInfo, sendCode } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-import { employeesList, userRoleById, addUser, selectUser, upDate, upDateStatus } from '@/api/user'
+import { employeesList, userRoleById, addUser, selectUser, upDate, upDateStatus, getTaUserAll, blacklistUser } from '@/api/user'
 
 const user = {
   state: {
@@ -161,6 +161,24 @@ const user = {
           reject(error)
         })
       })
+    },
+    GetTaUserAll({ commit }, data) { // 获取所有 移动端用户
+      return new Promise((resolve, reject) => {
+        getTaUserAll(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    BlacklistUser({ commit }, data) { // 拉黑移动端用户
+      return new Promise((resolve, reject) => {
+        blacklistUser(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-operate-manage/src/views/account/role/edi/index.vue

@@ -59,7 +59,7 @@ export default {
     }
   },
   mounted() {
-    this.ruleForm.id = this.$route.params.id
+    this.ruleForm.id = this.$route.query.id
     // 获取用户数据
     this.getInfo()
   },

VUECODE/smart-operate-manage/src/views/account/role/index.vue

@@ -181,13 +181,13 @@ export default {
         this.$message.error('只能选择一行数据!')
         return
       }
-      this.$router.push({ name: 'role-edi', params: { id: ids[0] }})
+      this.$router.push({ name: 'role-edi', query: { id: ids[0] }})
     },
     addRole() { // 添加角色
       this.$router.push({ name: 'role-add' })
     },
     infoRole(id) { // 查看角色详情
-      this.$router.push({ name: 'role-info', params: { id: id }})
+      this.$router.push({ name: 'role-info', query: { id: id }})
     }
   }
 }

VUECODE/smart-operate-manage/src/views/account/role/info/index.vue

@@ -59,13 +59,13 @@ export default {
     }
   },
   mounted() {
-    this.ruleForm.id = this.$route.params.id
+    this.ruleForm.id = this.$route.query.id
     // 获取用户数据
     this.getInfo()
   },
   methods: {
     submitForm(formName) {
-      this.$router.push({ name: 'role-edi', params: { id: this.ruleForm.id }})
+      this.$router.push({ name: 'role-edi', query: { id: this.ruleForm.id }})
     },
     resetForm() {
       // this.$refs[formName].resetFields()

VUECODE/smart-operate-manage/src/views/community/user/index.vue

@@ -0,0 +1,190 @@
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="用户姓名">
+        <el-input v-model="formInline.userName" placeholder="用户姓名"/>
+      </el-form-item>
+      <el-form-item label="手机号">
+        <el-input v-model="formInline.loginName" placeholder="手机号"/>
+      </el-form-item>
+      <el-form-item label="身份证号">
+        <el-input v-model="formInline.idCard" placeholder="身份证号"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" @click="clear">清空</el-button>
+        <el-button type="primary" @click="searchData">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="button-div">
+      <el-button type="warning" @click="blacklistUser">拉黑</el-button>
+    </div>
+    <el-table
+      ref="multipleTable"
+      :data="users"
+      border
+      tooltip-effect="dark"
+      style="width: 100%;margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        align="center"
+        type="selection"
+        width="55"/>
+      <el-table-column
+        align="center"
+        prop="userName"
+        label="姓名"/>
+      <el-table-column
+        align="center"
+        prop="loginName"
+        label="手机号"
+        width="120"/>
+      <el-table-column
+        align="center"
+        prop="idCard"
+        label="身份证号"/>
+      <el-table-column
+        align="center"
+        prop="gender"
+        label="性别">
+        <template slot-scope="scope">{{ scope.row.gender === '1' ? '男' : '女' }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="status"
+        label="账号状态">
+        <template slot-scope="scope">{{ scope.row.status === '2' ? '黑名单' : '正常' }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="createDate"
+        label="注册时间">
+        <template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        label="日志数据">
+        <template slot-scope="scope">
+          <el-button type="primary" @click="lookUserLog(scope.row.id)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="footer-page">
+      <el-pagination
+        :current-page="formInline.pageNum"
+        :page-sizes="[10, 20, 40, 100]"
+        :page-size="formInline.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'UserManagement',
+  data() {
+    return {
+      formInline: {
+        userName: '', // 用户名
+        loginName: '', // 手机号
+        idCard: '', // 身份证号
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0, // 总数
+      users: [], // 用户数据
+      ids: [] // 选中的id 集合
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    clear() { // 清除
+      this.formInline.userName = ''
+      this.formInline.loginName = ''
+      this.formInline.idCard = ''
+      this.formInline.pageNum = 1
+      this.formInline.pageSize = 10
+      this.getData()
+    },
+    handleSelectionChange(val) { // 选中
+      this.ids = []
+      val.map((item, index) => {
+        this.ids.push(item.id)
+      })
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+    },
+    searchData() { // 搜索
+      this.formInline.pageNum = 1
+      this.formInline.pageSize = 10
+      this.getData()
+    },
+    getData() {
+      this.$store.dispatch('GetTaUserAll', this.formInline).then((res) => {
+        const resCode = res.code
+        if (resCode === '0') {
+          const resData = res.data
+          this.users = resData.item
+          this.total = resData.total
+          this.formInline.pageNum = resData.pageNum
+          this.formInline.pageSize = resData.pageSize
+        }
+      }).catch(() => {
+        console.log('GetTaUserAll error')
+      })
+    },
+    formatDate(val) {
+      if (val === null) {
+        return
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    lookUserLog(id) { // 跳转查看用户日志
+      this.$router.push({ name: 'user-log', query: { id: id }})
+    },
+    blacklistUser() { // 拉黑移动端用户
+      this.$store.dispatch('BlacklistUser', this.ids).then((res) => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.getData()
+      }).catch(() => {
+        console.log('BlacklistUser error')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.demo-form-inline {
+  margin-left: 20px;
+  margin-top: 20px;
+}
+.button-div {
+  margin-left: 20px;
+}
+.footer-page {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>

VUECODE/smart-operate-manage/src/views/community/user/log/index.vue

@@ -0,0 +1,100 @@
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="操作类型">
+        <el-select v-model="formInline.logType" placeholder="操作类型">
+          <el-option label="账号相关操作" value="shanghai"/>
+          <el-option label="话题相关操作" value="beijing"/>
+          <el-option label="工单相关操作" value="beijing"/>
+          <el-option label="费用相关操作" value="beijing"/>
+          <el-option label="其他操作" value="beijing"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="日志关键字">
+        <el-input v-model="formInline.logContext" placeholder="日志关键字"/>
+      </el-form-item>
+      <el-form-item label="日志日期">
+        <el-date-picker
+          v-model="formInline.logDate"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info">清空</el-button>
+        <el-button type="primary">查询</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 表格 -->
+    <el-table
+      :data="logData"
+      border
+      style="width: 100%">
+      <el-table-column
+        prop="date"
+        label="编号"
+        width="180"/>
+      <el-table-column
+        prop="name"
+        label="操作类型"
+        width="180"/>
+      <el-table-column
+        prop="address"
+        label="日志类型"/>
+      <el-table-column
+        prop="address"
+        label="日志时间"/>
+    </el-table>
+
+    <div class="footer-page">
+      <el-pagination
+        :current-page="formInline.pageNum"
+        :page-sizes="[100, 200, 300, 400]"
+        :page-size="formInline.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'UserLog',
+  data() {
+    return {
+      formInline: {
+        logDate: '',
+        logContext: '',
+        logType: '',
+        pageNum: 0,
+        pageSize: 10
+      },
+      total: 0, // 总数
+      logData: [] // 数据
+    }
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.demo-form-inline {
+  margin-top: 20px;
+  margin-left: 20px;
+}
+.footer-page {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>

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

@@ -51,12 +51,14 @@ export function buildingList(data) {
     url: '/building/list',
     method: 'post',
     data: {
-      phase: data.phase,
-      building: data.building,
-      unit: data.unit,
-      level: data.level,
-      roomNo: data.roomNo,
+      phaseId: data.phaseId,
+      buildingId: data.buildingId,
+      unitId: data.unitId,
+      lelevelIdvel: data.levelId,
+      id: data.roomNoId,
       ownerName: data.ownerName,
+      ownerTel: data.ownerTel,
+      idCard: data.idCard,
       pageNum: data.pageNum,
       pageSize: data.pageSize
     }

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

@@ -1,6 +1,5 @@
 
-import { buildingAddress, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, buildingHouse, communityBuildingAdd, buildingDownloadExcel, addNode, deleteNode } from '@/api/buildingOwnerInfo'
-
+import { getPhaseList, getBuildingList, getUnitList, buildingList, getLevelList, getRoomNoList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, buildingHouse, communityBuildingAdd, buildingDownloadExcel, addNode, deleteNode } from '@/api/buildingOwnerInfo'
 
 const buildingOwnerInfo = {
   state: {

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

@@ -43,8 +43,14 @@
             :label="item.name"
             :value="item.id"/>
         </el-select>
-        <el-form-item label="业主名称">
-          <el-input v-model="listQuery.ownerName" placeholder="业主名称" />
+        <el-form-item label="姓名">
+          <el-input v-model="listQuery.ownerName" placeholder="姓名" />
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="listQuery.ownerTel" placeholder="手机号" />
+        </el-form-item>
+        <el-form-item label="身份证号">
+          <el-input v-model="listQuery.idCard" placeholder="身份证号" />
         </el-form-item>
       </el-form-item>
       <el-form-item>
@@ -71,18 +77,22 @@
       style="width: 100%; margin-top: 20px;"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column prop="phase" label="期" align="center" />
-      <el-table-column prop="building" label="栋" align="center" />
-      <el-table-column prop="unit" label="单元" align="center" />
-      <el-table-column prop="level" label="楼层" align="center" />
-      <el-table-column prop="roomNo" label="户号" align="center" />
-      <el-table-column prop="ownerName" label="业主姓名" align="center"/>
-      <el-table-column prop="ownerTel" label="手机号码" align="center" />
-      <el-table-column prop="pairStatus" label="关联业主状态" align="center" >
-        <template slot-scope="scope">{{ scope.row.verifyStatus === '1' ? '已关联':'未关联' }}</template>
+      <el-table-column prop="ownerName" label="姓名" align="center">
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.ownerName }}</span></a></template>
+      </el-table-column>
+      <el-table-column prop="ownerTel" label="手机号" align="center" />
+      <el-table-column prop="idCard" label="身份证号" align="center" />
+      <el-table-column prop="roleName" label="身份" align="center" />
+      <el-table-column prop="verifyStatus" label="审核状态" align="center" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.verifyStatus === '0'">未审核</span>
+          <span v-if="scope.row.verifyStatus === '1'">审核通过</span>
+          <span v-if="scope.row.verifyStatus === '2'">审核不通过</span>
+        </template>
       </el-table-column>
-      <el-table-column prop="createDate" label="创建时间" align="center" >
-        <template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template>
+      <el-table-column prop="updateName" label="编辑人" align="center" />
+      <el-table-column prop="updateDate" label="编辑时间" align="center" >
+        <template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template>
       </el-table-column>
     </el-table>
     <div class="block">
@@ -111,6 +121,8 @@ export default {
         levelId: '',
         roomNoId: '',
         ownerName: '',
+        ownerTel: '',
+        idCard: '',
         pageNum: 1,
         pageSize: 10
       },
@@ -188,7 +200,7 @@ export default {
       }
     },
     getPhase() { // 获取期
-      this.listQuery.phase = ''
+      this.listQuery.phaseId = ''
       this.$store.dispatch('GetPhaseList', this.listQuery).then((res) => {
         this.phaseList = res.data
       }).catch(() => {
@@ -204,7 +216,7 @@ export default {
       })
     },
     getUnit() { // 获取单元
-      this.listQuery.unit = ''
+      this.listQuery.unitId = ''
       this.$store.dispatch('GetUnitList', this.listQuery).then((res) => {
         this.unitList = res.data
       }).catch(() => {
@@ -212,7 +224,7 @@ export default {
       })
     },
     getLevel() { // 获取楼层
-      this.listQuery.level = ''
+      this.listQuery.levelId = ''
       this.$store.dispatch('GetLevelList', this.listQuery).then((res) => {
         this.levelList = res.data
       }).catch(() => {
@@ -220,7 +232,7 @@ export default {
       })
     },
     getRoomNo() { // 获取户号
-      this.listQuery.roomNo = ''
+      this.listQuery.roomNoId = ''
       this.$store.dispatch('GetRoomNoList', this.listQuery).then((res) => {
         this.roomNoList = res.data
       }).catch(() => {
@@ -234,31 +246,31 @@ export default {
           this.unitList = []
           this.levelList = []
           this.roomNoList = []
-          this.listQuery.building = ''
-          this.listQuery.unit = ''
-          this.listQuery.level = ''
-          this.listQuery.roomNo = ''
+          this.listQuery.buildingId = ''
+          this.listQuery.unitId = ''
+          this.listQuery.levelId = ''
+          this.listQuery.roomNoId = ''
           this.getBuild()
           break
         case 1: // 查询 单元
           this.unitList = []
           this.levelList = []
           this.roomNoList = []
-          this.listQuery.unit = ''
-          this.listQuery.level = ''
-          this.listQuery.roomNo = ''
+          this.listQuery.unitId = ''
+          this.listQuery.levelId = ''
+          this.listQuery.roomNoId = ''
           this.getUnit()
           break
         case 2: // 查询 楼层
           this.levelList = []
           this.roomNoList = []
-          this.listQuery.level = ''
-          this.listQuery.roomNo = ''
+          this.listQuery.levelId = ''
+          this.listQuery.roomNoId = ''
           this.getLevel()
           break
         case 3: // 查询 户号
           this.roomNoList = []
-          this.listQuery.roomNo = ''
+          this.listQuery.roomNoId = ''
           this.getRoomNo()
           break
       }
@@ -282,16 +294,21 @@ export default {
       })
     },
     emptyListQuery() { // 清空按钮
-      this.listQuery.phase = ''
-      this.listQuery.building = ''
-      this.listQuery.unit = ''
-      this.listQuery.level = ''
-      this.listQuery.roomNo = ''
+      this.listQuery.phaseId = ''
+      this.listQuery.buildingId = ''
+      this.listQuery.unitId = ''
+      this.listQuery.levelId = ''
+      this.listQuery.roomNoId = ''
       this.listQuery.ownerName = ''
+       this.listQuery.ownerTel = ''
+        this.listQuery.idCard = ''
       this.listQuery.pageNum = 1
       // 获取数据
       this.dataQuery()
     },
+    clickTitle(id) {
+      alert(id)
+    },
     deleteData() { // 删除
       this.$confirm('您确定要删除吗?')
         .then(_ => {

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1554689368" Name="smartCommunity" Objects="857" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1554714177" Name="smartCommunity" Objects="857" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12473,13 +12473,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o643">
 <a:ObjectID>D7E63227-82C6-4CD8-8C18-FC3A18FDE237</a:ObjectID>
-<a:Name>ta_user_id</a:Name>
-<a:Code>ta_user_id</a:Code>
+<a:Name>ta_user_verify_id</a:Name>
+<a:Code>ta_user_verify_id</a:Code>
 <a:CreationDate>1540878521</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1540878707</a:ModificationDate>
+<a:ModificationDate>1554714177</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>用户id</a:Comment>
+<a:Comment>用户审核表id</a:Comment>
 <a:DataType>int(11)</a:DataType>
 <a:Length>11</a:Length>
 </o:Column>