修复人脸

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/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

@@ -116,17 +116,19 @@ public class TaUserServiceImpl implements ITaUserService {
         // 校验用户
         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;
         }
@@ -804,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;
         }
 
@@ -852,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");
@@ -971,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

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