提交

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

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 @Mapper
 public interface TaUserHkMapper {
     int deleteByPrimaryKey(Integer id);
@@ -24,4 +26,8 @@ public interface TaUserHkMapper {
     @Select("select * from ta_user_hk where ta_user_id = #{userVerifyId} and community_id = #{communityId}")
     TaUserHk selectByUserVerifyIdAndCommunityId(@Param("userVerifyId") Integer userVerifyId, @Param("communityId") Integer communityId);
 
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_hk where community_id = #{communityId}")
+    List<TaUserHk> selectByCommunityId(@Param("communityId") Integer communityId);
+
 }

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

@@ -100,7 +100,7 @@ public interface TaUserVerifyMapper {
 
     @ResultMap("BaseResultMap")
     @Select("select * from ta_user_verify where community_id=#{communityId}" +
-            " and verify_status =  1")
+            " and verify_status =  1 and id in (1120,1122,1128,1133,1134,1119)")
     List<TaUserVerify> selectByCommunityId(@Param("communityId") Integer communityId);
 
 
@@ -111,9 +111,13 @@ public interface TaUserVerifyMapper {
      */
     @ResultMap("BaseResultMap")
     @Select(
-            "SELECT *  " + "FROM " +
-            "ta_user_verify " +
-            "WHERE  id NOT IN (" +
+            "SELECT *  FROM " +
+            "ta_user_verify uv " +
+            "WHERE   uv.verify_status = \"1\" " +
+             "and " +
+               "uv.community_id = #{communityId} " +
+             "and " +
+              "uv.id NOT IN (" +
                 "SELECT " +
                     "tuv.id  " +
                 "FROM " +
@@ -121,7 +125,7 @@ public interface TaUserVerifyMapper {
                 "WHERE " +
                     "tm.uuid_type = \"1\" " +
                     "AND tuv.verify_status = \"1\" " +
-                    "AND tuv.community_id = 107 " +
+                    "AND tuv.community_id = #{communityId} " +
                     "AND tm.message_type = \"9\" " +
                     "AND tm.advice_type = \"1\" " +
                     "AND tm.model_type = \"1\" " +
@@ -131,6 +135,30 @@ public interface TaUserVerifyMapper {
                 "tuv.id  " +
             ") "
     )
-    List<TaUserVerify> selectNotMessage(Integer communityId);
+    List<TaUserVerify> selectNotMessage(@Param("communityId") Integer communityId);
 
+    /**
+     * 查询 这个审核id 是否已经推送过消息
+     * @param communityId
+     * @param userVerfiyId
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT " +
+            "* " +
+            "FROM " +
+            "ta_user_verify tuv " +
+            "LEFT JOIN tp_message tm ON tuv.id = tm.uuid  " +
+            "WHERE " +
+            "tm.uuid_type = \"1\"  " +
+            "AND tuv.verify_status = \"1\"  " +
+            "AND tuv.community_id = #{communityId}  " +
+            "AND tm.message_type = \"9\"  " +
+            "AND tm.advice_type = \"1\"  " +
+            "AND tm.model_type = \"1\"  " +
+            "AND tm.source = \"1\"  " +
+            "AND tm.`status` = \"1\"  " +
+            "and tm.uuid = #{userVerfiyId} " +
+            "GROUP BY " +
+            "tuv.id ")
+    TaUserVerify selectChcekNotMessage(@Param("communityId") Integer communityId, @Param("userVerfiyId") Integer userVerfiyId);
 }

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

@@ -264,4 +264,5 @@ public class TaUserVerify {
     public void setLoginName(String loginName) {
         this.loginName = loginName;
     }
+
 }

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

@@ -23,6 +23,11 @@ public interface IHKService {
      */
     ResponseBean addAuthoritiesAnddownloadAuthorityByPersonIds(TaUserVerify userVerify, TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree);
 
+    /**
+     * 下发门禁人脸权限 指定人员人脸/指纹权限下载
+     * @return
+     */
+    ResponseBean downloadFaceAndFingerInfos(TpEquipmentTree tpEquipmentTree, TaUserVerify userVerify, TaUserHk taUserHk);
 
     /**
      * 下发门禁权限(异动方式)
@@ -43,4 +48,12 @@ public interface IHKService {
      * @return
      */
     ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify, TaUser user);
+
+    /**
+     * 可视对讲时 指定人员人脸权限下载
+     * @return
+     */
+    ResponseBean visualIntercom(TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify);
+
+
 }

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

@@ -252,6 +252,9 @@ public class FaceServicelimpl implements FaceServiceI {
                     // 下发可是对讲卡权限
                     ihkService.visualIntercomPermissions(unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user);
 
+                    // 下发门禁权限
+                    ihkService.addAuthoritiesAnddownloadAuthorityByPersonIds(userVerify, taUserHk, tpEquipmentTree);
+
                     taFaceMapper.insertSelective(taFace);
                 } else {
                     taFaceMapper.updateByPrimaryKeySelective(taFace);
@@ -262,53 +265,13 @@ public class FaceServicelimpl implements FaceServiceI {
 
                 responseBean.addSuccess(taFace);
 
-
-                // 所有设备
-                // List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
-                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(tpEquipmentTree.getCommunityId(), userVerify.getUnitId(), 4);
-                if (CollectionUtils.isNotEmpty(tpEquipments)) {
-                    List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
-                    StringBuilder doorUuids = new StringBuilder();
-                    StringBuilder deviceUuids = new StringBuilder();
-                    equipmentUUID.forEach(e-> {
-                        doorUuids.append(e.get("doorUuid"));
-                        doorUuids.append(",");
-                        deviceUuids.append(e.get("deviceUuid"));
-                        deviceUuids.append(",");
-                    });
-                    if (StringUtils.isBlank(deviceUuids)) {
-                        responseBean.addError("系统未配置设备！");
-                        throw new WisdomException("系统未配置设备！");
-                    }
-                    Map<String,Object> map = Maps.newHashMap();
-                    map.put("appkey", tpEquipmentTree.getAppkey());
-                    map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-                    map.put("personIds", String.valueOf(taUserHk.getHkUserId()));
-                    map.put("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
-                    map.put("type", 1);
-                    map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-                    HKOpenApi.downloadFaceAndFingerInfos(map);
-
-
-                }
+                // 下发门禁人脸权限
+                ihkService.downloadFaceAndFingerInfos(tpEquipmentTree, userVerify, taUserHk);
 
 
                 //可视对讲时 指定人员人脸权限下载
-                List<Integer> userIdList = new ArrayList<>();
-                userIdList.add(taUserHk.getHkUserId());
-                //临时设备编号
-                // TODO 根据期楼栋号，来查询出门口机
-
-                // 单元门口机
-                List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(tpEquipmentTree.getCommunityId(), userVerify.getUnitId(), 3);
-                if (CollectionUtils.isNotEmpty(visualEquipments)) {
-                    List<String> visualList = visualEquipments.stream()
-                            .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
-                            .collect(Collectors.toList());
-//                List<String> visualList = new ArrayList<>();
-//                visualList.add("10010100000");
-                    HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
-                }
+                ihkService.visualIntercom(tpEquipmentTree, taUserHk, userVerify);
+
             } else {
                 responseBean.addError("请录入正确图片");
             }

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

@@ -179,6 +179,42 @@ public class HKServiceImpl implements IHKService {
         return responseBean;
     }
 
+    @Override
+    public ResponseBean downloadFaceAndFingerInfos(TpEquipmentTree tpEquipmentTree, TaUserVerify userVerify, TaUserHk taUserHk) {
+
+        ResponseBean responseBean = new ResponseBean();
+
+        // 所有设备
+        // List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(tpEquipmentTree.getCommunityId(), userVerify.getUnitId(), 4);
+        if (CollectionUtils.isNotEmpty(tpEquipments)) {
+            List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
+            StringBuilder doorUuids = new StringBuilder();
+            StringBuilder deviceUuids = new StringBuilder();
+            equipmentUUID.forEach(e-> {
+                doorUuids.append(e.get("doorUuid"));
+                doorUuids.append(",");
+                deviceUuids.append(e.get("deviceUuid"));
+                deviceUuids.append(",");
+            });
+            if (org.apache.commons.lang3.StringUtils.isBlank(deviceUuids)) {
+                responseBean.addError("系统未配置设备！");
+                throw new WisdomException("系统未配置设备！");
+            }
+            Map<String,Object> map = Maps.newHashMap();
+            map.put("appkey", tpEquipmentTree.getAppkey());
+            map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+            map.put("personIds", String.valueOf(taUserHk.getHkUserId()));
+            map.put("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
+            map.put("type", 1);
+            map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            HKOpenApi.downloadFaceAndFingerInfos(map);
+
+        }
+
+        return responseBean;
+    }
+
     @Override
     @Deprecated
     public ResponseBean downloadAuthorityByDeviceUuids() {
@@ -523,4 +559,37 @@ public class HKServiceImpl implements IHKService {
         responseBean.addError("操作失败");
         throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
     }
+
+
+    @Override
+    public ResponseBean visualIntercom(TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify) {
+
+        ResponseBean responseBean = new ResponseBean();
+
+        //可视对讲时 指定人员人脸权限下载
+        List<Integer> userIdList = new ArrayList<>();
+        userIdList.add(taUserHk.getHkUserId());
+        //临时设备编号
+        // TODO 根据期楼栋号，来查询出门口机
+
+        // 单元门口机
+        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(tpEquipmentTree.getCommunityId(), userVerify.getUnitId(), 3);
+        if (CollectionUtils.isNotEmpty(visualEquipments)) {
+            List<String> visualList = visualEquipments.stream()
+                    .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                    .collect(Collectors.toList());
+//                List<String> visualList = new ArrayList<>();
+//                visualList.add("10010100000");
+            String visualIntercomJSON = HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+            JSONObject addCardsJsonObject = JSONObject.parseObject(visualIntercomJSON);
+            Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+            if (0 == addCardsResultCode.intValue()) {
+                responseBean.addSuccess("操作成功！");
+                return responseBean;
+            }
+
+        }
+
+        return responseBean;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.beust.jcommander.internal.Lists;
 import com.beust.jcommander.internal.Maps;
 import com.community.commom.hk.HKOpenApi;
 import com.community.commom.mode.ResponseBean;
@@ -9,6 +10,7 @@ import com.community.huiju.common.messagePush;
 import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
+import com.community.huiju.service.IHKService;
 import com.community.huiju.service.userDataHKsiteI;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +32,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Slf4j
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class userDataHKsiteImpl  implements userDataHKsiteI {
 
     @Autowired
@@ -64,27 +66,35 @@ public class userDataHKsiteImpl  implements userDataHKsiteI {
     @Autowired
     private TpMessageMapper tpMessageMapper;
 
+    @Autowired
+    private IHKService ihkService;
+
     @Override
     public ResponseBean cleanHKdata(Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         //根据小区id查询审核数据
         List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectByCommunityId(communityId);
 
+        int i = 1;
         for (TaUserVerify taUserVerify : userVerifyList){
+            log.info("当前编号：{}, 人员审核id：{}", i, taUserVerify.getId());
             //重新构建海康和我们的关系
-            buildHKData(taUserVerify);
+            TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(taUserVerify.getId(), taUserVerify.getCommunityId());
+            if (null == taUserHk) {
+                buildHKData(taUserVerify);
+            }
         }
 
         return responseBean;
     }
 
     private void buildHKData(TaUserVerify taUserVerify) {
-        //查询人脸信息
-        TaFace taFace = taFaceMapper.getByUserVerifyId(taUserVerify.getId());
 
         TaUserHk taUserHk = new TaUserHk();
         taUserHk.setHkPersonNo(idGen.nextId());
 
+        //查询人脸信息
+        TaFace taFace = taFaceMapper.getByUserVerifyId(taUserVerify.getId());
 
         TaUser taUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
 
@@ -192,50 +202,72 @@ public class userDataHKsiteImpl  implements userDataHKsiteI {
             }
         }
 
-        //=================== 下发可是对讲卡权限 =====================
-
-        //--------- 可视对讲 ----------
-
-        Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
-        // app用户权限勿动 unitHkSetting.getPermissionId()
-        addOutDoorAuthMap.put("authName", taUser.getUserName()+taUserVerify.getId());
-        addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
-        addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
-        addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
-        addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-
-        // 单元门口机
-        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(taUserVerify.getCommunityId(), taUserVerify.getUnitId(), 3);
-        // 可是对讲设备号
-        List<String> visualList = visualEquipments.stream()
-                .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
-                .collect(Collectors.toList());
-
-        addOutDoorAuthMap.put("longNums", visualList); // visualList
-        // 可视对讲下发 权限
-         String addOutDoorAuthJSONString = HKOpenApi.addOutDoorAuth(addOutDoorAuthMap);
-        JSONObject addOutDoorAuthJSON = JSONObject.parseObject(addOutDoorAuthJSONString);
-        int addOutDoorAuthJSONCode = (int) addOutDoorAuthJSON.get("errorCode");
-        if (addOutDoorAuthJSONCode != 0 ) {
-            String errorMessage = String.valueOf(addOutDoorAuthJSON.get("errorMessage"));
-            log.error("可视对讲下发 权限失败! {}", errorMessage);
-            throw new RuntimeException(errorMessage);
-        }
+        // 存在人脸的时候才下发人脸 卡权限/人脸权限
+        if (null != taFace) {
+
+            //=================== 下发可是对讲卡权限 =====================
+
+            //--------- 可视对讲 ----------
+
+            Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
+            // app用户权限勿动 unitHkSetting.getPermissionId()
+            addOutDoorAuthMap.put("authName", taUser.getUserName()+taUserVerify.getId());
+            addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
+            addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
+            addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+            addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+
+            // 单元门口机
+            List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(taUserVerify.getCommunityId(), taUserVerify.getUnitId(), 3);
+            // 可是对讲设备号
+            List<String> visualList = visualEquipments.stream()
+                    .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                    .collect(Collectors.toList());
+
+            addOutDoorAuthMap.put("longNums", visualList); // visualList
+            // 可视对讲下发 权限
+            String addOutDoorAuthJSONString = HKOpenApi.addOutDoorAuth(addOutDoorAuthMap);
+            JSONObject addOutDoorAuthJSON = JSONObject.parseObject(addOutDoorAuthJSONString);
+            int addOutDoorAuthJSONCode = (int) addOutDoorAuthJSON.get("errorCode");
+            if (addOutDoorAuthJSONCode != 0 ) {
+                String errorMessage = String.valueOf(addOutDoorAuthJSON.get("errorMessage"));
+                log.error("可视对讲下发 权限失败! {}", errorMessage);
+                throw new RuntimeException(errorMessage);
+            }
+
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+
+            //================ 可是对讲人脸权限下发 ==============
+
+            // 可视对讲时 指定人员人脸权限下载
+            List<Integer> userIdList = new ArrayList<>();
+            userIdList.add(taUserHk.getHkUserId());
+
+            HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+
+
+            // 下发门禁权限
+            ihkService.addAuthoritiesAnddownloadAuthorityByPersonIds(taUserVerify, taUserHk, tpEquipmentTree);
+
+            // 下发门禁人脸
+            ihkService.downloadFaceAndFingerInfos(tpEquipmentTree, taUserVerify, taUserHk);
 
-        try {
-            Thread.sleep(2000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
         }
 
-         //================ 可是对讲人脸权限下发 ==============
 
-        // 可视对讲时 指定人员人脸权限下载
-        List<Integer> userIdList = new ArrayList<>();
-        userIdList.add(taUserHk.getHkUserId());
+        TaUserVerify tempVerify = taUserVerifyMapper.selectChcekNotMessage(tpEquipmentTree.getCommunityId(), taUserVerify.getId());
+        if (null == tempVerify) {
+            // 推送默认消息
+            sendMessage(taUserVerify);
+        }
+
 
-        HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
     }
 
     /**
@@ -294,30 +326,101 @@ public class userDataHKsiteImpl  implements userDataHKsiteI {
 
         // 查询所有没有关联消息的审核数据
 
-        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectNotMessage(communityId);
+         List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectNotMessage(communityId);
+         // TaUserVerify tempUserVerify = taUserVerifyMapper.selectByPrimaryKey(1151);
+         // List<TaUserVerify> userVerifyList = Lists.newArrayList(tempUserVerify);
         for (TaUserVerify userVerify : userVerifyList) {
+            TaUserVerify tempVerify = taUserVerifyMapper.selectChcekNotMessage(userVerify.getCommunityId(), userVerify.getId());
+            if (null == tempVerify) {
+                // 推送默认消息
+                sendMessage(userVerify);
+            }
+        }
+
+        return responseBean;
+    }
+
+    /**
+     * 给人员推送默认消息
+     * @param userVerify
+     */
+    private void sendMessage(TaUserVerify userVerify) {
+
+        //审核通过后推送消息（临时数据）
+        String[] messageArr= new messagePush().messagePushAll();
+        Date createDate = new Date();
+        for (String count:messageArr) {
+            TpMessage message = new TpMessage();
+            message.setCommunityId(userVerify.getCommunityId());
+            message.setMessageType("9");
+            message.setAdviceType("1");
+            message.setModelType("1");
+            message.setUuid(userVerify.getId());
+            message.setUuidType("1");
+            message.setSource("1");
+            message.setMessageContent(count);
+            message.setStatus("1");
+            message.setResult("");
+            message.setMeaasgeTypeId("");
+            message.setReadStatus("0");
+            message.setCreateUser(userVerify.getUserId());
+            message.setCreateDate(createDate);
+            tpMessageMapper.insert(message);
+        }
+    }
+
+    @Override
+    public ResponseBean cleanCardPersionHk(Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        //根据小区id查询审核数据
+        List<TaUserHk> taUserHkList = taUserHkMapper.selectByCommunityId(communityId);
+        for (TaUserHk taUserHk : taUserHkList) {
 
-            //审核通过后推送消息（临时数据）
-            String[] messageArr= new messagePush().messagePushAll();
-            for (String count:messageArr) {
-                TpMessage message = new TpMessage();
-                message.setCommunityId(userVerify.getCommunityId());
-                message.setMessageType("9");
-                message.setAdviceType("1");
-                message.setModelType("1");
-                message.setUuid(userVerify.getId());
-                message.setUuidType("1");
-                message.setSource("1");
-                message.setMessageContent(count);
-                message.setStatus("1");
-                message.setResult("");
-                message.setMeaasgeTypeId("");
-                message.setReadStatus("0");
-                message.setCreateUser(userVerify.getUserId());
-                message.setCreateDate(new Date());
-                tpMessageMapper.insert(message);
+            TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(taUserHk.getTaUserId());
+            if (null == userVerify){
+                continue;
+            }
+            TaUser taUser = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
+
+            // 海康权限信息
+            TpUnitHkSetting unitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+            TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
+            //--------- 可视对讲 ----------
+
+            Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
+            // app用户权限勿动 unitHkSetting.getPermissionId()
+            addOutDoorAuthMap.put("authName", taUser.getUserName()+userVerify.getId());
+            addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
+            addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
+            addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+            addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+
+            // 单元门口机
+            List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+            // 可是对讲设备号
+            List<String> visualList = visualEquipments.stream()
+                    .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                    .collect(Collectors.toList());
+
+            addOutDoorAuthMap.put("longNums", visualList); // visualList
+            // 可视对讲下发 权限
+            String addOutDoorAuthJSONString = HKOpenApi.addOutDoorAuth(addOutDoorAuthMap);
+            JSONObject addOutDoorAuthJSON = JSONObject.parseObject(addOutDoorAuthJSONString);
+            int addOutDoorAuthJSONCode = (int) addOutDoorAuthJSON.get("errorCode");
+            if (addOutDoorAuthJSONCode != 0 ) {
+                String errorMessage = String.valueOf(addOutDoorAuthJSON.get("errorMessage"));
+                log.error("可视对讲下发 权限失败! {}", errorMessage);
+                throw new RuntimeException(errorMessage);
             }
 
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
 
         return responseBean;

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

@@ -11,4 +11,11 @@ public interface userDataHKsiteI {
      * @return
      */
     ResponseBean cleanMessage(Integer communityId);
+
+    /**
+     * 清洗数据，人员可是对讲卡权限下发
+     * @param communityId
+     * @return
+     */
+    ResponseBean cleanCardPersionHk(Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/siteutil/userDataHKsite.java

@@ -51,4 +51,12 @@ public class userDataHKsite {
         return responseBean;
     }
 
+    @ApiOperation(value = "清洗人员可是对讲卡权限", notes = "清洗人员可是对讲卡权限")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "communityId", value = "小区ID") })
+    @RequestMapping(value = "/site/permission/{communityId}",method = RequestMethod.GET)
+    public ResponseBean cleanCardPermissionHk(@PathVariable("communityId") Integer communityId){
+        ResponseBean responseBean = userDataHKsite.cleanCardPersionHk(communityId);
+        return responseBean;
+    }
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKOpenApi.java

@@ -803,7 +803,7 @@ public class HKOpenApi {
             log.error("可视对讲人脸下发错误：{}", e);
             throw new RuntimeException("下发错误!");
         }
-        return null;
+        return data;
     }
     /**
      * 可视对讲 根据人员 ID 集添加权限并下发

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

@@ -598,8 +598,40 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
 
         tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
+
+        // 推送消息
+        sendMessage(taUserVerify);
     }
-    
+
+    /**
+     * 给人员推送默认消息
+     * @param userVerify
+     */
+    private void sendMessage(TaUserVerify userVerify) {
+
+        //审核通过后推送消息（临时数据）
+        String[] messageArr= new messagePush().messagePushAll();
+        LocalDateTime localDateTime = LocalDateTime.now();
+        for (String count:messageArr) {
+            Message message = new Message();
+            message.setCommunityId(userVerify.getCommunityId());
+            message.setMessageType("9");
+            message.setAdviceType("1");
+            message.setModelType("1");
+            message.setUuid(userVerify.getId());
+            message.setUuidType("1");
+            message.setSource("1");
+            message.setMessageContent(count);
+            message.setStatus("1");
+            message.setResult("");
+            message.setMeaasgeTypeId("");
+            message.setReadStatus("0");
+            message.setCreateUser(userVerify.getUserId());
+            message.setCreateDate(localDateTime);
+            messageMapper.insert(message);
+        }
+    }
+
     @Override
     public ResponseBean updataApprove(String paramets) {
         ResponseBean response = new ResponseBean();