修改 海康逻辑

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

 	/**
 	 * 文件上传临时路径
 	 */
-	@Bean
-	public MultipartConfigElement multipartConfigElement() {
-		MultipartConfigFactory factory = new MultipartConfigFactory();
-		factory.setLocation("/tmp/smart-community");
-		return factory.createMultipartConfig();
-	}
+//	@Bean
+//	public MultipartConfigElement multipartConfigElement() {
+//		MultipartConfigFactory factory = new MultipartConfigFactory();
+//		factory.setLocation("/tmp/smart-community");
+//		return factory.createMultipartConfig();
+//	}
 
 }

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

 import com.community.commom.session.UserElement;
 import com.community.huiju.model.HkVisitorBill;
 import com.community.huiju.service.IHKService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import com.community.huiju.service.ISenCartId;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 	@Autowired
 	private IHKService ihkService;
 
+	@Autowired
+	private ISenCartId iSenCartId;
+
 	@ApiOperation(value = "发送访客账单", notes = "发送访客账单")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "body", name = "hkVisitorBill", dataType = "String",value = "billNum: 账单号,reservationNum:预约单号,plateNum:出场车牌号,leaveTime:出场时间,billFee:账单金额")})
 	@RequestMapping(value = "/sendVisitorBill",method = RequestMethod.POST)
 		return responseBean;
 	}
 
+	@ApiOperation(value = "添加人员并卡卡")
+	@RequestMapping(value = "/addUserAndOpenCart", method = RequestMethod.POST)
+	public ResponseBean addUser(@RequestParam("communityId") Integer communityId) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = iSenCartId.addUserAndAddCartId(communityId);
+		return responseBean;
+	}
+
+	@RequestMapping(value = "/addUserOne", method = RequestMethod.POST)
+	@ApiOperation(value = "根据人员为主下发，测试用的")
+	public ResponseBean addUserOne(@ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
+								   @RequestParam(required = false) Integer communityId) {
+
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = iSenCartId.addUserOne(communityId, uploadFile);
+		return responseBean;
+
+	}
 
 }

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

     int updateByPrimaryKey(TaUserHk record);
 
     @ResultMap("BaseResultMap")
-    @Select("select * from ta_user_hk where ta_user_id = #{userId} and community_id = #{communityId}")
-    TaUserHk selectByUserIdAndCommunityId(@Param("userId") Integer userId, @Param("communityId") Integer communityId);
+    @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);
 
 }

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

 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;
     List<TaUser> getByLoginNameList(@Param("loginName") String loginName);
 	
 	TaUser getByOpenId(@Param("openid") String openid);
+
+    /**
+     * 查询已审核通过的，但是没有 海康id 的用户
+     * @param communityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT " +
+            "tuv.id as userVerifyId, " +
+            "tuv.unit_id as unitId, " +
+            " tau.* " +
+            "FROM " +
+            " ta_user_verify tuv " +
+            " LEFT JOIN ta_user tau ON tuv.user_id = tau.id " +
+            " LEFT JOIN ta_user_hk tuh on tuv.user_id = tuh.ta_user_id " +
+            "WHERE " +
+            " tuv.verify_status = 1 " +
+            " AND tuv.community_id = #{communityId} " +
+            " and tuh.hk_user_id is NULL")
+    List<TaUser> selectNotHKuserId(@Param("communityId") Integer communityId);
+
 }

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

      */
     private String faceImg;
 
+    /**
+     * 单元id
+     */
+    private Integer unitId;
+
     public void setHouseList(List<TpBuildingOwnerInfo> houseList) {
         this.houseList = houseList;
     }
     public void setFaceImg(String faceImg) {
         this.faceImg = faceImg;
     }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
 }

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

 
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaUserHk;
+import com.community.huiju.model.TaUserVerify;
+import com.community.huiju.model.TpEquipmentTree;
+import com.community.huiju.model.TpUnitHkSetting;
 
 /**
  * 海康 业务
     ResponseBean pushPerson(String appUserId, Integer userVerifyId);
 
     /**
-     * 下发门禁权限
+     * 添加门禁权限 和 下发门禁权限
+     * @return
+     */
+    ResponseBean addAuthoritiesAnddownloadAuthorityByPersonIds(TaUserVerify userVerify, TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree);
+
+
+    /**
+     * 下发门禁权限(异动方式)
      * @return
      */
     ResponseBean downloadAuthorityByDeviceUuids();
      */
     ResponseBean syncControl(UserElement userElement, Integer equipmentId);
 
+    /**
+     * 下发 可视对讲 权限
+     * @return
+     */
+    ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify);
+
 }

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

+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 添加人员，建卡
+ *
+ * @author weiximei on 2019-06-21
+ */
+public interface ISenCartId {
+
+    /**
+     * 添加人员，建卡
+     * @param communityId
+     * @return
+     */
+    ResponseBean addUserAndAddCartId(Integer communityId);
+
+    /**
+     * 添加人员，用于测试以人员的方式下发
+     * @return
+     */
+    ResponseBean addUserOne(Integer communityId, MultipartFile uploadFile);
+
+}

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

     @Autowired
     private TaUserHkMapper taUserHkMapper;
 
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId) {
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
         ResponseBean responseBean = new ResponseBean();
         /*审核房产是否通过*/
         TaUserVerify taUserVerify= infoExist(userElement.getUserVerifyId());
         }
         Integer activeUser = otherUserId == null ? userElement.getId() : otherUserId;
 
-        /**
-         * 删除的时候，将所有的海康设备的关联关系删除了，需要重新下发一次
-         */
-        // 下发门禁
-        ihkService.pushPerson(activeUser + "", userVerifyId);
-
         TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
         TaFace taFace = new TaFace();
         taFace.setFaceImg(faceImg);
         taFace.setUpdateDate(new Date());
 
         /*验证身份*/
-        responseBean = addVerify(activeUser, userVerifyId, uploadFile, faceImg, taFace, tpEquipmentTree);
+        responseBean = addVerify(activeUser, userVerifyId, uploadFile, faceImg, taFace);
         return responseBean;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean upDateFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId) {
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
+
         ResponseBean responseBean = new ResponseBean();
         // 人脸图片地址url
         String faceImg = img(uploadFile);
         }
 
         // 海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userElement.getId(), userElement.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerifyId, userElement.getCommunityId());
 
-        /**
-         * 删除的时候，将所有的海康设备的关联关系删除了，需要重新下发一次
-         */
+        // 审核数据
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
-        // 下发门禁
-        ihkService.pushPerson(activeUser + "", userVerifyId);
+        // 海康权限信息
+        TpUnitHkSetting tpUnitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
+        // 设备树
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
+
 
         //当前修改的id否存在
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
         face.setFaceImg(faceImg);
         face.setUpdateUser(userElement.getId());
         face.setUpdateDate(new Date());
-        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid(), taUserHk);
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, taUserHk, tpUnitHkSetting, tpEquipmentTree, userVerify);
         if (resps.getCode().equals("0")) {
             resps.addSuccess((Object) faceImg);
         } else {
      * @param taFace
      * @param isA
      * @param uploadFile
-     * @param userId
-     * @param communityId
-     * @param roomNoId
-     * @param unitId
-     * @param appkey
-     * @param secret
-     * @param openapi_ip_port_http 海康服务器地址
+     * @param taUserHk
+     * @param unitHkSetting
+     * @param tpEquipmentTree
+     * @param userVerify
      * @return
      */
-    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, Integer unitId, String  appkey, String secret, String openapi_ip_port_http, String opUserUuid, TaUserHk taUserHk) {
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, TaUserHk taUserHk, TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserVerify userVerify) {
         ResponseBean responseBean = new ResponseBean();
-        TaUser user = taUserMapper.selectByPrimaryKey(userId);
+
+        if (null == unitHkSetting) {
+            responseBean.addError("海康权限信息 未配置");
+            return responseBean;
+        }
+
+        if (null == tpEquipmentTree) {
+            responseBean.addError("设备树 未配置");
+            return responseBean;
+        }
+
+        if (null == userVerify) {
+            responseBean.addError("审核数据 不能为null");
+            return responseBean;
+        }
+
+
+        TaUser user = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
         if (taUserHk.getHkUserId() == null) {
             responseBean.addError("海康人员ID不存在，无法录入");
-            log.error("本地库人员ID：{}  的海康人员ID不存在", userId);
+            log.error("本地库人员ID：{}  的海康人员ID不存在", userVerify.getUserId());
             return responseBean;
         }
         AESDecode aesd = new AESDecode();
             Integer type = (Integer) jsonObject.get("errno");
             Integer faceNum = (Integer) jsonObject.get("face_num");
 
-            /*推送海康*/
-            String data = HKOpenApi.HKpersonGroupId(uploadFile, taUserHk.getHkUserId(), taUserHk.getHkPersonNo(), user.getUserName(), taUserHk.getHkCardNo(), appkey, secret, openapi_ip_port_http, opUserUuid);
+            // 修改人脸操作
+            String data = HKOpenApi.HKpersonGroupId(uploadFile, taUserHk.getHkUserId(), taUserHk.getHkPersonNo(), user.getUserName(), taUserHk.getHkCardNo(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid());
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
                     log.error("海康人脸推送失败！");
                     throw new RuntimeException("人脸推送失败！");
                 }
+
+                // 下发卡权限
+                // 下发可是对讲卡权限
+                ihkService.visualIntercomPermissions(unitHkSetting, tpEquipmentTree, taUserHk, userVerify);
+
                 if (isA) {
                     taFaceMapper.insertSelective(taFace);
                 } else {
                     taFaceMapper.updateByPrimaryKeySelective(taFace);
                 }
+
+                // 等待 1s
+                Thread.sleep(1000);
+
                 responseBean.addSuccess("操作成功");
 
-                // 设备树
-                TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
+
                 // 所有设备
                 // List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
-                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(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();
                     map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
                     HKOpenApi.downloadFaceAndFingerInfos(map);
 
-                    // 等待 2s
-                    Thread.sleep(2000);
+
                 }
 
 
                 // TODO 根据期楼栋号，来查询出门口机
 
                 // 单元门口机
-                List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 3);
+                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())
     /**
      * 各种身份校验
      */
-    public ResponseBean addVerify(Integer userid, Integer userVerifyId, MultipartFile uploadFile, String faceImg, TaFace taFace, TpEquipmentTree tpEquipmentTree) {
+    public ResponseBean addVerify(Integer userid, Integer userVerifyId, MultipartFile uploadFile, String faceImg, TaFace taFace) {
         ResponseBean response = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
             response.addError("当前房产审核记录不存在！");
             return response;
         }
+
         TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
 
         //身份为家属租客，状态为已停用
         }
 
         // 海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), userVerify.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getId(), userVerify.getCommunityId());
+
+        // 海康权限信息
+        TpUnitHkSetting tpUnitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
+        // 设备树
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
 
         //查询当前用户是否有人脸记录
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
         if (null == face) {
             boolean isA = true;
             if (Constant.EFFECTIVE_STATUS.equals(taUser.getStatus())) {
-                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(),tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid(), taUserHk);
+                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, taUserHk, tpUnitHkSetting, tpEquipmentTree, userVerify);
                 if (responseBean.getCode().equals("0")) {
                     responseBean.addSuccess("图片录入成功");
                 } else {
         return response;
     }
 
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addWelcomeFace(MultipartFile uploadFile, TaUser user) {

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

         }
 
         // 海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), userVerify.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getId(), userVerify.getCommunityId());
         if (null == taUserHk) {
             taUserHk = new TaUserHk();
         }
         // 海康权限信息
         TpUnitHkSetting unitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
 
+        // 设备树
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
 
         // 这两个值一般都是同时存在的
              * 2.根据部门编号推送 海康
              */
             taUserMapper.updateByPrimaryKeySelective(user);
-            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk, unitHkSetting);
+            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk, unitHkSetting, userVerify);
         }
 
         // 卡片操作
         }
 
 
+        // 判断是否成功
+        if ("0".equals(responseBean.getCode())) {
+            responseBean.addSuccess("操作成功！");
+            return responseBean;
+        }
+        throw new WisdomException("操作失败!");
+    }
 
-        // 推送海康
 
-        // 给用户添加 海康门禁权限
+    @Override
+    public ResponseBean addAuthoritiesAnddownloadAuthorityByPersonIds(TaUserVerify userVerify, TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree) {
 
+        ResponseBean responseBean = new ResponseBean();
+
+        // 给用户添加 海康门禁权限
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 4);
         List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
         StringBuilder doorUuids = new StringBuilder();
         });
 
         if (org.apache.commons.lang3.StringUtils.isNotBlank(doorUuids)) {
-
             Map<String, Object> map = Maps.newHashMap();
             map.put("personIds",String.valueOf(taUserHk.getHkUserId()));
             map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
             map.put("appkey", tpEquipmentTree.getAppkey());
             map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
             map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-            HKOpenApi.addAuthoritiesByPersonIds(map);
+            String addAuthoritiesJSONString = HKOpenApi.addAuthoritiesByPersonIds(map);
+            validHKError(addAuthoritiesJSONString);
 
             // 下发门禁权限
             Map<String, Object> downloadAuthorityByPersonIdsMap = Maps.newHashMap();
             downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
             downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
             downloadAuthorityByPersonIdsMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-            HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
-
+            String downloadAuthorityJSON = HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
+            validHKError(downloadAuthorityJSON);
         }
 
-        //--------- 可视对讲 ----------
-
-        Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
-        // app用户权限勿动
-        addOutDoorAuthMap.put("authName", unitHkSetting.getPermissionId());
-        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());
-//        List<String> visualList = new ArrayList<>();
-//        visualList.add("10010100000");
-        addOutDoorAuthMap.put("longNums", visualList);
-        // 可视对讲下发 权限
-        visualIntercomPermissions(addOutDoorAuthMap);
-        if ("0".equals(responseBean.getCode())) {
-            responseBean.addSuccess("操作成功！");
-            return responseBean;
-        }
-        throw new WisdomException("操作失败!");
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
     }
 
     @Override
      * @param response
      * @param user
      */
-    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TpUnitHkSetting unitHkSetting) {
+    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TpUnitHkSetting unitHkSetting, TaUserVerify userVerify) {
 //        Map<String, Object> parDept = Maps.newHashMap();
 //        parDept.put("pageNo", 1);
 //        parDept.put("pageSize", 100);
 
             int row = 0;
             if (null == taUserHk.getId()) {
-                taUserHk.setTaUserId(user.getId());
+                // 存储的是审核id
+                taUserHk.setTaUserId(userVerify.getId());
                 taUserHk.setCommunityId(tpEquipmentTree.getCommunityId());
+                taUserHk.setCreateDate(new Date());
+                taUserHk.setUpdateDate(new Date());
                 // 存储海康人员ID
                 row = taUserHkMapper.insertSelective(taUserHk);
             } else {
         return response;
     }
 
+    /**
+     * 校验错误
+     * @param json
+     */
+    private void validHKError(String json) {
+        Map<String, Object> resultMap = JSONObject.parseObject(json, HashMap.class);
+        Integer errorCode = (Integer) resultMap.get("errorCode");
+        if (errorCode.intValue() != 0) {
+            throw new RuntimeException(String.valueOf(resultMap.get("errorMessage")));
+        }
+    }
+
     /**
      * 获取部门 uuid
      * <p>
      *
      * @param map
      */
-    private void visualIntercomPermissions(Map<String,Object> map) {
+    private String visualIntercomPermissions(Map<String,Object> map) {
         // TODO 目前下发的 authName权限组是我们自定义的, 后面肯定是按照小区的 期楼栋号来设置的
         // TODO longNums设备编号, 可视对讲的机器编号, 应该根据 期楼栋号 下面的机器编号来设置的
 
         //--------- 可视对讲 ----------
 
         // 可视对讲 根据人员 ID 集添加权限并下发
-        HKOpenApi.addOutDoorAuth(map);
+        return HKOpenApi.addOutDoorAuth(map);
 
     }
 
         responseBean.addError("操作失败!");
         return responseBean;
     }
+
+    @Override
+    public ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify) {
+
+        ResponseBean responseBean = new ResponseBean();
+
+        if (null == unitHkSetting) {
+            responseBean.addError("海康权限信息 未配置");
+            return responseBean;
+        }
+
+        if (null == tpEquipmentTree) {
+            responseBean.addError("设备树 未配置");
+            return responseBean;
+        }
+
+        if (null == userVerify) {
+            responseBean.addError("审核数据 不能为null");
+            return responseBean;
+        }
+
+        //--------- 可视对讲 ----------
+
+        Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
+        // app用户权限勿动
+        addOutDoorAuthMap.put("authName", unitHkSetting.getPermissionId());
+        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());
+//        List<String> visualList = new ArrayList<>();
+//        visualList.add("10010100000");
+        addOutDoorAuthMap.put("longNums", visualList);
+        // 可视对讲下发 权限
+        String permissionsJSON = visualIntercomPermissions(addOutDoorAuthMap);
+        JSONObject addCardsJsonObject = JSONObject.parseObject(permissionsJSON);
+        Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+        if (0 == addCardsResultCode.intValue()) {
+            responseBean.addSuccess("操作成功！");
+            return responseBean;
+        }
+
+        responseBean.addError("操作失败");
+        throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
+    }
 }

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

+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.hk.HKOpenApi;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.uuid.IdGen;
+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.ISenCartId;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.bouncycastle.cms.PasswordRecipientId;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * weiximei on 2019-06-21
+ */
+@Service
+@Slf4j
+public class SenCartIdImpl implements ISenCartId {
+
+    @Autowired
+    private IHKService ihkService;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
+
+    @Autowired
+    private TpEquipmentTreeMapper tpEquipmentTreeMapper;
+
+    private IdGen idGen = IdGen.get();
+
+    @Autowired
+    private TaUserHkMapper taUserHkMapper;
+
+    @Autowired
+    private TpEquipmentMapper tpEquipmentMapper;
+
+    @Autowired
+    private TpConfigurationMapper tpConfigurationMapper;
+
+    @Override
+    public ResponseBean addUserAndAddCartId(Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 查询审核已通过的，但是没有海康id的
+        List<TaUser> taUserList = taUserMapper.selectNotHKuserId(communityId);
+
+        for (TaUser user : taUserList) {
+
+            // 海康权限信息
+            TpUnitHkSetting unitHkSetting = getUnitHkSetting(communityId, user.getUnitId());
+
+            TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
+
+            TaUserHk taUserHk = new TaUserHk();
+            // 设置 海康id
+            taUserHk.setHkPersonNo(idGen.nextId());
+            /**
+             * 1.获取部门(比如 住户)
+             * 2.根据部门编号推送 海康
+             */
+            taUserMapper.updateByPrimaryKeySelective(user);
+            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk, unitHkSetting);
+
+
+            // 卡片操作
+
+            // 添加卡片
+            responseBean = addCards(taUserHk, tpEquipmentTree);
+
+            // 开卡
+            responseBean = openCard(taUserHk.getHkUserId(), Long.valueOf(taUserHk.getHkCardNo()), null,tpEquipmentTree);
+
+        }
+
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+
+
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
+    /**
+     * 公共方法
+     * 添加人员
+     *
+     * @param response
+     * @param user
+     */
+    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TpUnitHkSetting unitHkSetting) {
+//        Map<String, Object> parDept = Maps.newHashMap();
+//        parDept.put("pageNo", 1);
+//        parDept.put("pageSize", 100);
+//        parDept.put("deptName", Constant.DEPT_RESIDENTS);
+//        parDept.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        parDept.put("appkey", tpEquipmentTree.getAppkey());
+//        parDept.put("secret", tpEquipmentTree.getSecret());
+//        parDept.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        // 部门UUID
+        //String deptUuid = getDeptUUID(parDept);
+
+        // 添加人员
+        Map<String, Object> parUser = Maps.newHashMap();
+        parUser.put("personNo", taUserHk.getHkPersonNo());
+        parUser.put("personName", user.getUserName());
+        // parUser.put("phoneNo", user.getLoginName());
+        parUser.put("remark", user.getLoginName());
+        parUser.put("deptUuid", unitHkSetting.getDepartmentId());
+        parUser.put("secret", tpEquipmentTree.getSecret());
+        parUser.put("appkey", tpEquipmentTree.getAppkey());
+        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
+        Integer errorCode = (Integer) resultMap.get("errorCode");
+        if (errorCode == 0) {
+            Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
+
+            // 海康人员ID
+            Integer personId = (Integer) resultDataMap.get("personId");
+
+            taUserHk.setHkUserId(personId);
+
+            int row = 0;
+            if (null == taUserHk.getId()) {
+                taUserHk.setTaUserId(user.getId());
+                taUserHk.setCommunityId(tpEquipmentTree.getCommunityId());
+                // 存储海康人员ID
+                row = taUserHkMapper.insertSelective(taUserHk);
+            } else {
+                row = taUserHkMapper.updateByPrimaryKeySelective(taUserHk);
+            }
+
+            if (row > 0) {
+                response.addSuccess("操作成功!");
+            } else {
+                response.addError("操作失败");
+                throw new RuntimeException("数据库添加 家属/租客 人员失败!");
+            }
+
+        } else {
+            String errorMessage = String.valueOf(resultMap.get("errorMessage"));
+            response.addError(errorMessage);
+            log.error("海康添加人员失败! {}", errorMessage);
+            throw new RuntimeException(errorMessage);
+        }
+    }
+
+    /**
+     * 添加卡片
+     * @return
+     */
+    public ResponseBean addCards(TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree) {
+
+        ResponseBean response = new ResponseBean();
+
+        // 开卡 卡号
+        long cardNo = System.currentTimeMillis();
+
+        // 添加卡片
+        Map<String,Object> addCardsMap = new HashMap<>();
+        addCardsMap.put("secret", tpEquipmentTree.getSecret());
+        addCardsMap.put("appkey", tpEquipmentTree.getAppkey());
+        addCardsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        addCardsMap.put("startCardNo", cardNo);
+        addCardsMap.put("endCardNo", cardNo);
+        addCardsMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        String addCardsJSON = HKOpenApi.addCards(addCardsMap);
+        JSONObject addCardsJsonObject = JSONObject.parseObject(addCardsJSON);
+        Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+        if (0 != addCardsResultCode) {
+            response.addError("操作失败");
+            throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
+        }
+
+        // 卡片入库
+        taUserHk.setHkCardNo(cardNo + "");
+        taUserHkMapper.updateByPrimaryKeySelective(taUserHk);
+        return response;
+    }
+
+    /**
+     * 卡片开卡
+     *
+     * @param personId 人员海康id
+     * @param cardNo 卡号
+     * @param expirationTime    有效期为多少? 单位为 年
+     * @return
+     */
+    private ResponseBean openCard(Integer personId, Long cardNo, Integer expirationTime, TpEquipmentTree tpEquipmentTree) {
+        ResponseBean response = new ResponseBean();
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        LocalDate today = LocalDate.now();
+        int year = today.getYear();
+        // 加上20, 表示加上20年,默认
+        if (null == expirationTime || expirationTime <= 0) {
+            year += 20;
+        } else {
+            year += expirationTime;
+        }
+        int month = today.getMonthValue();
+        int day = today.getDayOfMonth();
+
+        Long time = null;
+        try {
+            time = formatter.parse(year + "-" + month + "-" + day).getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        // 开卡
+        Map<String, Object> parOpenCard = Maps.newHashMap();
+        parOpenCard.put("personId", personId);
+        parOpenCard.put("cardNo", cardNo);
+        parOpenCard.put("startTime", System.currentTimeMillis());
+        parOpenCard.put("endTime", time);
+        parOpenCard.put("secret", tpEquipmentTree.getSecret());
+        parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
+        parOpenCard.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parOpenCard.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
+        int code = (int) openCardJSON.get("errorCode");
+        if (code == 0) {
+            response.addSuccess("操作成功!");
+        } else {
+            String errorMessage = String.valueOf(openCardJSON.get("errorMessage"));
+            response.addError(errorMessage);
+            log.error("开卡失败! {}", errorMessage);
+            throw new RuntimeException(errorMessage);
+        }
+
+        return response;
+    }
+
+    @Override
+    public ResponseBean addUserOne(Integer communityId, MultipartFile uploadFile) {
+        ResponseBean responseBean = new ResponseBean();
+
+
+        TaUser user = new TaUser();
+        user.setLoginName("15677789713");
+        user.setUnitId(110);
+        user.setHkPersonNo(idGen.nextId());
+        user.setUserName("魏熙美测试1");
+
+        // 海康权限信息
+        TpUnitHkSetting unitHkSetting = getUnitHkSetting(communityId, user.getUnitId());
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
+
+        // =================== 添加人员 ===========================
+//        Map<String, Object> parUser = Maps.newHashMap();
+//        parUser.put("personNo", user.getHkPersonNo());
+//        parUser.put("personName", user.getUserName());
+//        // parUser.put("phoneNo", user.getLoginName());
+//        parUser.put("remark", user.getLoginName());
+//        parUser.put("deptUuid", unitHkSetting.getDepartmentId());
+//        parUser.put("secret", tpEquipmentTree.getSecret());
+//        parUser.put("appkey", tpEquipmentTree.getAppkey());
+//        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+//        Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
+//        Integer errorCode = (Integer) resultMap.get("errorCode");
+//        if (errorCode != 0) {
+//            responseBean.addError("人员添加 操作失败");
+//            throw new RuntimeException(String.valueOf(resultMap.get("errorMessage")));
+//        }
+//        Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
+//        // 海康人员ID
+//        Integer personId = (Integer) resultDataMap.get("personId");
+//        user.setHkUserId(personId);
+//
+//        // =================== 添加卡片 =====================
+//
+//        // 开卡 卡号
+//        long cardNo = System.currentTimeMillis();
+//        // 添加卡片
+//        Map<String,Object> addCardsMap = new HashMap<>();
+//        addCardsMap.put("secret", tpEquipmentTree.getSecret());
+//        addCardsMap.put("appkey", tpEquipmentTree.getAppkey());
+//        addCardsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        addCardsMap.put("startCardNo", cardNo);
+//        addCardsMap.put("endCardNo", cardNo);
+//        addCardsMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+//        String addCardsJSON = HKOpenApi.addCards(addCardsMap);
+//        JSONObject addCardsJsonObject = JSONObject.parseObject(addCardsJSON);
+//        Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+//        if (0 != addCardsResultCode) {
+//            responseBean.addError("操作失败");
+//            throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
+//        }
+//
+//        user.setHkCardNo(cardNo + "");
+//
+//        // ============== 人员绑定卡片 ======================
+//
+//        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+//        LocalDate today = LocalDate.now();
+//        int year = today.getYear();
+//        // 加上20, 表示加上20年,默认
+//        year += 20;
+//
+//        int month = today.getMonthValue();
+//        int day = today.getDayOfMonth();
+//
+//        Long time = null;
+//        try {
+//            time = formatter.parse(year + "-" + month + "-" + day).getTime();
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//        }
+//
+//        // 开卡
+//        Map<String, Object> parOpenCard = Maps.newHashMap();
+//        parOpenCard.put("personId", user.getHkUserId());
+//        parOpenCard.put("cardNo", Long.valueOf(cardNo));
+//        parOpenCard.put("startTime", System.currentTimeMillis());
+//        parOpenCard.put("endTime", time);
+//        parOpenCard.put("secret", tpEquipmentTree.getSecret());
+//        parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
+//        parOpenCard.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        parOpenCard.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+//        JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
+//        int code = (int) openCardJSON.get("errorCode");
+//        if (code != 0) {
+//            String errorMessage = String.valueOf(openCardJSON.get("errorMessage"));
+//            responseBean.addError(errorMessage);
+//            log.error("人员绑定开卡失败! {}", errorMessage);
+//            throw new RuntimeException(errorMessage);
+//        }
+
+
+
+        // ============= 修改人脸 ==================
+        String data = HKOpenApi.HKpersonGroupId(uploadFile, 1236, 1142018896048422912L, user.getUserName(), "1561113497593", tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid());
+
+
+        //=================== 下发可是对讲卡权限 =====================
+
+        //--------- 可视对讲 ----------
+
+//        Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
+//        // app用户权限勿动 unitHkSetting.getPermissionId()
+//        addOutDoorAuthMap.put("authName", "魏熙美测试1");
+//        addOutDoorAuthMap.put("personIds", Arrays.asList(user.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(communityId, user.getUnitId(), 3);
+//        // 可是对讲设备号
+//        List<String> visualList = visualEquipments.stream()
+//                .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+//                .collect(Collectors.toList());
+////        List<String> visualList = new ArrayList<>();
+////        visualList.add("10030100001");
+//        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"));
+//            responseBean.addError(errorMessage);
+//            log.error("可视对讲下发 权限失败! {}", errorMessage);
+//            throw new RuntimeException(errorMessage);
+//        }
+
+//        try {
+//            Thread.sleep(1000);
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        }
+
+        // ================ 可是对讲人脸权限下发 ==============
+
+        //可视对讲时 指定人员人脸权限下载
+//        List<Integer> userIdList = new ArrayList<>();
+//        userIdList.add(user.getHkUserId());
+//
+//        HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+//
+//        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+}

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

     @Autowired
     private TaUserHkMapper taUserHkMapper;
 
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean login(String loginName, String code, HttpSession session) {
         if ("1".equals(response.getCode())) {
             throw new WisdomException("推送HK失败！");
         }
+
+//        // 海康权限信息
+//        TpUnitHkSetting unitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+//
+//        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+//
+//        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getId(), userElement.getCommunityId());
+//
+//        // 下发可是对讲卡权限
+//        response = ihkService.visualIntercomPermissions(unitHkSetting, tpEquipmentTree, taUserHk, userVerify);
+//        if ("1".equals(response.getCode())) {
+//            throw new WisdomException("可视对讲卡权限下发失败！");
+//        }
+
         // 推送消息
         String[] messageArr= new messagePush().messagePushAll( );
         for (String count : messageArr) {
         return response;
     }
 
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
     /**
      * 查询 楼栋信息
      *      根据小区Id, 栋,单元,楼层,房号, 手机号
         taUserVO.setVerifyStatus(userVerify.getVerifyStatus());
 
         // 设置海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(taUserVO.getId(), userVerify.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getId(), userVerify.getCommunityId());
         if (null != taUserHk) {
             taUserVO.setHkUserId(taUserHk.getHkUserId() + "");
             taUserVO.setHkPersonNo(taUserHk.getHkPersonNo() + "");

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

         // 获取设备树，里面有 opUserId
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
 
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userId, communityId);
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userElement.getUserVerifyId(), communityId);
 
         String result = HKOpenApi.temporaryRegister(visitor.getVisitorName(),visitor.getVisitorTel(),
                 Integer.valueOf(visitor.getVisitorNum()),visitor.getVisitorStartTime().getTime(),