提交

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

@@ -105,7 +105,7 @@ public class FaceServicelimpl implements FaceServiceI {
          * 删除的时候，将所有的海康设备的关联关系删除了，需要重新下发一次
          */
         // 下发门禁
-        ihkService.pushPerson(activeUser + "", taUserVerify.getId());
+        ihkService.pushPerson(activeUser + "", userVerifyId);
 
         TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
         TaFace taFace = new TaFace();
@@ -142,6 +142,12 @@ public class FaceServicelimpl implements FaceServiceI {
 
         Integer activeUser = otherUserId == null ? userElement.getId() : otherUserId;
 
+        // 如果家属不为空，获取家属/租客 的房产审核id
+        if (null != otherUserId) {
+            TaUserVerify otherUserVerify = getTaFaceParentId(userElement, otherUserId);
+            userVerifyId = otherUserVerify.getId();
+        }
+
         /**
          * 删除的时候，将所有的海康设备的关联关系删除了，需要重新下发一次
          */
@@ -205,7 +211,8 @@ public class FaceServicelimpl implements FaceServiceI {
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
-                    throw new RuntimeException("海康人脸推送失敗！");
+                    log.error("海康人脸推送失败！");
+                    throw new RuntimeException("人脸推送失败！");
                 }
                 if (isA) {
                     taFaceMapper.insertSelective(taFace);
@@ -219,6 +226,9 @@ public class FaceServicelimpl implements FaceServiceI {
                 // 所有设备
                 // List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
                 List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(communityId, unitId, 4);
+                if (CollectionUtils.isEmpty(tpEquipments)) {
+                    throw new WisdomException("未配置设备！");
+                }
                 List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
                 StringBuilder doorUuids = new StringBuilder();
                 StringBuilder deviceUuids = new StringBuilder();

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

@@ -392,6 +392,13 @@ public class TaUserServiceImpl implements ITaUserService {
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
         List<TaUser> userList = taUserMapper.selectHouseUserList(userElement.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getId());
 
+        userList.stream().forEach(e-> {
+            // 如果有人脸图片，则显示人脸图片信息
+            if (StringUtils.isNotBlank(e.getFaceImg())) {
+                e.setHeadPortrait(e.getFaceImg());
+            }
+        });
+
         responseBean.addSuccess(userList);
         return responseBean;
     }

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

@@ -360,9 +360,11 @@
     tu.face_status as faceStatus,
     tuv.verify_status as userVerifyStatus,
     tuv.id as userVerifyId,
-    tsr.role_name as roleName
+    tsr.role_name as roleName,
+    tf.face_img as faceImg
     FROM ta_user tu INNER JOIN ta_user_verify tuv ON tu.id = tuv.user_id
     INNER JOIN ta_sys_role tsr ON tuv.role_id = tsr.id
+    LEFT JOIN ta_face tf ON tf.ta_user_verify_id = tuv.id
     WHERE
 	tuv.community_id = #{communityId}
 	AND tuv.phase_id = #{phaseId}