合并

CODE/foreign-service/src/main/java/com/community/huiju/controller/TaFceController.java

@@ -3,10 +3,7 @@ package com.community.huiju.controller;
 import com.community.huiju.common.base.BaseController;
 import com.community.huiju.common.base.ResponseBean;
 import com.community.huiju.service.FaceServiceI;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -39,7 +36,7 @@ public class TaFceController extends BaseController {
     })
     public ResponseBean addFace(@RequestParam(value = "userId") Integer userId,
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
-                                @RequestParam(value = "uploadFile") MultipartFile uploadFile) {
+                                @RequestParam(value = "uploadFile") @ApiParam(value = "uploadFile" ,required = true) MultipartFile uploadFile) {
 
         ResponseBean responseBean = new ResponseBean();
         responseBean = faceServiceI.addFace(userId, userVerifyId, uploadFile);
@@ -61,7 +58,7 @@ public class TaFceController extends BaseController {
     })
     public ResponseBean updateFace(@RequestParam(value = "userId") Integer userId,
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
-                                @RequestParam(value = "uploadFile") MultipartFile uploadFile) {
+                                @RequestParam(value = "uploadFile") @ApiParam(value = "uploadFile" ,required = true) MultipartFile uploadFile) {
 
         ResponseBean responseBean = new ResponseBean();
         responseBean = faceServiceI.updateFace(userId, userVerifyId, uploadFile);

CODE/foreign-service/src/main/java/com/community/huiju/dao/TaUserHkMapper.java

@@ -0,0 +1,30 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUserHk;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 住户app端用户与海康关联表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-12
+ */
+public interface TaUserHkMapper extends BaseMapper<TaUserHk> {
+
+    /**
+     * 根据用户id 和 小区id 进行查询
+     * @param userId
+     * @param communityId
+     * @return
+     */
+    @ResultType(TaUserHk.class)
+    @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);
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/model/TaUserHk.java

@@ -0,0 +1,79 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 住户app端用户与海康关联表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_user_hk")
+public class TaUserHk implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 人员Id
+     */
+    private Integer taUserId;
+
+    /**
+     * 海康人员编号
+     */
+    private Long hkPersonNo;
+
+    /**
+     * 海康用户id
+     */
+    private Integer hkUserId;
+
+    /**
+     * 海康卡片号码
+     */
+    private String hkCardNo;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -1,9 +1,11 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.ailiyun.AESDecode;
 import com.community.commom.constant.Constant;
+import com.community.commom.hk.HKConstant;
 import com.community.commom.hk.HKOpenApi;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.ResponseBean;
@@ -67,6 +69,9 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
     @Autowired
     private TpEquipmentTreeMapper tpEquipmentTreeMapper;
 
+    @Autowired
+    private TaUserHkMapper taUserHkMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(Integer userId, Integer userVerifyId, MultipartFile uploadFile) {
@@ -133,6 +138,9 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         // 下发门禁
         ihkService.pushPerson(userId + "", userVerifyId);
 
+        // 海康数据
+        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), userVerify.getCommunityId());
+
         //当前修改的id否存在
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
         if (null == face) {
@@ -144,7 +152,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         face.setFaceImg(faceImg);
         face.setUpdateUser(userId);
         face.setUpdateDate(new Date());
-        ResponseBean resps = checKout(faceImg, face, false, uploadFile, userId, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, userId, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid(), taUserHk);
         if (resps.getCode().equals("0")) {
             resps.addSuccess(face);
         } else {
@@ -168,10 +176,10 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
      * @param openapi_ip_port_http 海康服务器地址
      * @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) {
+    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) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectById(userId);
-        if (user.getHkUserId() == null) {
+        if (taUserHk.getHkUserId() == null) {
             log.error("本地库人员ID：{}  的海康人员ID不存在", userId);
             throw new WisdomException(ResponseErrorsMessages.NOT_PUSH_FACE.getCode(), ResponseErrorsMessages.NOT_PUSH_FACE.getMsg());
         }
@@ -184,7 +192,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
             Integer faceNum = (Integer) jsonObject.get("face_num");
 
             /*推送海康*/
-            String data = HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo(), appkey, secret, openapi_ip_port_http);
+            String data = HKOpenApi.HKpersonGroupId(uploadFile, taUserHk.getHkUserId(), taUserHk.getHkPersonNo(), user.getUserName(), taUserHk.getHkCardNo(), appkey, secret, openapi_ip_port_http, opUserUuid);
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
@@ -216,7 +224,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
                     Map<String,Object> map = Maps.newHashMap();
                     map.put("appkey", tpEquipmentTree.getAppkey());
                     map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-                    map.put("personIds", String.valueOf(user.getHkUserId()));
+                    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());
@@ -323,12 +331,15 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
             return response;
         }
 
+        // 海康数据
+        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), 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());
+                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(),tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid(), taUserHk);
                 if (responseBean.getCode().equals("0")) {
                     responseBean.addSuccess("人脸录入成功");
                 } else {
@@ -351,69 +362,114 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         }
         TaUser taUser = taUserMapper.selectById(taUserVerify.getUserId());
 
+        // 校验是否存在人脸
+        QueryWrapper<TaFace> faceQueryWrapper = new QueryWrapper<>();
+        faceQueryWrapper.eq("ta_user_verify_id", taUserVerify.getUserVerifyId());
+        TaFace taFace = taFaceMapper.selectOne(faceQueryWrapper);
+        if (null == taFace) {
+            responseBean.addError(ResponseErrorsMessages.NOT_USER_FACE.getCode(), ResponseErrorsMessages.NOT_USER_FACE.getMsg());
+            return responseBean;
+        }
+
+        // 海康数据
+        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(taUserVerify.getUserId(), taUserVerify.getCommunityId());
+
         // 设备树
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(taUserVerify.getCommunityId());
         // 所有设备
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(taUserVerify.getCommunityId(), taUserVerify.getUnitId(), 4);
-        if (CollectionUtils.isEmpty(tpEquipments)) {
-            responseBean.addError(ResponseErrorsMessages.NOT_EQUIPMENT.getCode(), ResponseErrorsMessages.NOT_EQUIPMENT.getMsg());
-            return responseBean;
-        }
-        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(",");
-        });
-
-
-        // TODO 删除人脸，是否删除海康
-        // 修改人脸(图片为null时。海康删除人脸)
+
+        // 门禁删除人脸
+        if (CollectionUtils.isNotEmpty(tpEquipments)) {
+            // responseBean.addError(ResponseErrorsMessages.NOT_EQUIPMENT.getCode(), ResponseErrorsMessages.NOT_EQUIPMENT.getMsg());
+
+
+            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(",");
+            });
+
+
+            // TODO 删除人脸，是否删除海康
+            // 修改人脸(图片为null时。海康删除人脸)
 //        HKOpenApi.HKpersonGroupId(null, taUser.getHkUserId(), taUser.getHkPersonNo(), taUser.getUserName(), taUser.getHkCardNo(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
-        // 删除 权限
-        Map<String,Object> selectUserFaceMap = Maps.newHashMap();
-        selectUserFaceMap.put("personIds", taUser.getHkUserId()+"");
-        selectUserFaceMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-        selectUserFaceMap.put("appkey", tpEquipmentTree.getAppkey());
-        selectUserFaceMap.put("secret", tpEquipmentTree.getSecret());
-        selectUserFaceMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        // 查询人脸信息
-        HKOpenApi.selectUserFace(selectUserFaceMap);
-
-        Map<String,Object> deleteUserMap = Maps.newHashMap();
-        deleteUserMap.put("personIds", taUser.getHkUserId()+"");
-        deleteUserMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-        deleteUserMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
-        deleteUserMap.put("appkey", tpEquipmentTree.getAppkey());
-        deleteUserMap.put("secret", tpEquipmentTree.getSecret());
-        deleteUserMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        // 删除当前人脸设备信息
-        String data= HKOpenApi.deleteUser(deleteUserMap);
-        JSONObject object= JSONObject.parseObject(data);
-
-        if (object.get("errorCode").equals(1)){
-            String errorMessage=  object.getString("errorMessage");
-            log.info("删除人脸信息异常：{}", data);
-            responseBean.addError(ResponseErrorsMessages.DELETE_FACE.getCode(), ResponseErrorsMessages.DELETE_FACE.getMsg());
-            return responseBean;
+            // 删除 权限
+            Map<String,Object> selectUserFaceMap = Maps.newHashMap();
+            selectUserFaceMap.put("personIds", taUserHk.getHkUserId()+"");
+            selectUserFaceMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+            selectUserFaceMap.put("appkey", tpEquipmentTree.getAppkey());
+            selectUserFaceMap.put("secret", tpEquipmentTree.getSecret());
+            selectUserFaceMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            // 查询人脸信息
+            HKOpenApi.selectUserFace(selectUserFaceMap);
+
+            Map<String,Object> deleteUserMap = Maps.newHashMap();
+            deleteUserMap.put("personIds", taUserHk.getHkUserId()+"");
+            deleteUserMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+            deleteUserMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
+            deleteUserMap.put("appkey", tpEquipmentTree.getAppkey());
+            deleteUserMap.put("secret", tpEquipmentTree.getSecret());
+            deleteUserMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            // 删除当前人脸设备信息
+            String data= HKOpenApi.deleteUser(deleteUserMap);
+            JSONObject object= JSONObject.parseObject(data);
+
+            if (object.get("errorCode").equals(1)){
+                String errorMessage=  object.getString("errorMessage");
+                log.info("删除人脸信息异常：{}", data);
+                responseBean.addError(ResponseErrorsMessages.DELETE_FACE.getCode(), ResponseErrorsMessages.DELETE_FACE.getMsg());
+                return responseBean;
+            }
+            // 异动同步到设备
+            Map<String,Object> appointJurisdictionMap = Maps.newHashMap();
+            appointJurisdictionMap.put("appkey", tpEquipmentTree.getAppkey());
+            appointJurisdictionMap.put("secret", tpEquipmentTree.getSecret());
+            appointJurisdictionMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+            appointJurisdictionMap.put("personIds", taUserHk.getHkUserId()+"" );
+            appointJurisdictionMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
+            appointJurisdictionMap.put("operateType",3);
+            appointJurisdictionMap.put("includeFinger",0);
+            appointJurisdictionMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+
+            HKOpenApi.appointJurisdiction(appointJurisdictionMap);
+
+        }
+
+        // 门口机删除人脸
+        // 单元门口机
+        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(taUserVerify.getCommunityId(), taUserVerify.getUnitId(), 3);
+        if (CollectionUtils.isNotEmpty(visualEquipments)) {
+            List<String> visualList = visualEquipments.stream()
+                    .map(e -> tpConfigurationMapper.selectById(e.getUuidId()).getConfigurationValue())
+                    .collect(Collectors.toList());
+
+            List<Integer> userIdList = new ArrayList<>();
+            userIdList.add(taUserHk.getHkUserId());
+
+            Map<String, Object> delOutDoorAuthMap = Maps.newHashMap();
+            delOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+            delOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
+            delOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+            delOutDoorAuthMap.put("personIds", userIdList);
+            delOutDoorAuthMap.put("longNums", visualList);
+            delOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+
+            //可视对讲时 指定人员权限删除
+            HKOpenApi.delOutDoorAuth(delOutDoorAuthMap);
+
+            // 可是对讲时， 删除人脸权限
+            HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 2, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+
         }
 
+
+
         taFaceMapper.deleteFace(userVerifyId);
-        // 异动同步到设备
-        Map<String,Object> appointJurisdictionMap = Maps.newHashMap();
-        appointJurisdictionMap.put("appkey", tpEquipmentTree.getAppkey());
-        appointJurisdictionMap.put("secret", tpEquipmentTree.getSecret());
-        appointJurisdictionMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-        appointJurisdictionMap.put("personIds", taUser.getHkUserId()+"" );
-        appointJurisdictionMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
-        appointJurisdictionMap.put("operateType",3);
-        appointJurisdictionMap.put("includeFinger",0);
-        appointJurisdictionMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-
-         HKOpenApi.appointJurisdiction(appointJurisdictionMap);
         // HKOpenApi.selectUserSynchronization();
         // ihkService.downloadAuthorityByDeviceUuids();
         return responseBean;

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/HKServiceImpl.java

@@ -50,6 +50,9 @@ public class HKServiceImpl implements IHKService {
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+    @Autowired
+    private TaUserHkMapper taUserHkMapper;
+
 //    @Autowired
 //    private TaRemotelyDoorMapper taRemotelyDoorMapper;
 
@@ -80,28 +83,34 @@ public class HKServiceImpl implements IHKService {
         }
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
 
+        // 海康数据
+        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), userVerify.getCommunityId());
+        if (null == taUserHk) {
+            taUserHk = new TaUserHk();
+        }
+
         // 这两个值一般都是同时存在的
         // 当这两个值不存在的时候，就添加海康人员
-        if (null == user.getHkUserId() && null == user.getHkPersonNo()) {
+        if (null == taUserHk.getHkUserId() && null == taUserHk.getHkPersonNo()) {
             // 设置 海康id
-            user.setHkPersonNo(idGen.nextId());
+            taUserHk.setHkPersonNo(idGen.nextId());
             /**
              * 1.获取部门(比如 住户)
              * 2.根据部门编号推送 海康
              */
             taUserMapper.updateById(user);
-            addUserAndOpenCard(responseBean, user, tpEquipmentTree);
+            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk);
         }
 
         // 卡片操作
         // 没有卡片就开卡
-        if (StringUtils.isBlank(user.getHkCardNo())) {
+        if (StringUtils.isBlank(taUserHk.getHkCardNo())) {
 
             // 添加卡片
-            responseBean = addCards(user, tpEquipmentTree);
+            responseBean = addCards(taUserHk, tpEquipmentTree);
 
             // 开卡
-            responseBean = openCard(user.getHkUserId(), Long.valueOf(user.getHkCardNo()), null,tpEquipmentTree);
+            responseBean = openCard(taUserHk.getHkUserId(), Long.valueOf(taUserHk.getHkCardNo()), null,tpEquipmentTree);
 
         }
 
@@ -125,7 +134,7 @@ public class HKServiceImpl implements IHKService {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(doorUuids)) {
 
             Map<String, Object> map = Maps.newHashMap();
-            map.put("personIds",String.valueOf(user.getHkUserId()));
+            map.put("personIds",String.valueOf(taUserHk.getHkUserId()));
             map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
             map.put("secret", tpEquipmentTree.getSecret());
             map.put("appkey", tpEquipmentTree.getAppkey());
@@ -134,7 +143,7 @@ public class HKServiceImpl implements IHKService {
 
             // 下发门禁权限
             Map<String, Object> downloadAuthorityByPersonIdsMap = Maps.newHashMap();
-            downloadAuthorityByPersonIdsMap.put("personIds",String.valueOf(user.getHkUserId()));
+            downloadAuthorityByPersonIdsMap.put("personIds",String.valueOf(taUserHk.getHkUserId()));
             downloadAuthorityByPersonIdsMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
             downloadAuthorityByPersonIdsMap.put("operateType",1);
             downloadAuthorityByPersonIdsMap.put("includeFinger",1);
@@ -148,13 +157,14 @@ public class HKServiceImpl implements IHKService {
         //--------- 可视对讲 ----------
 
         Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
-        addOutDoorAuthMap.put("authName", "荟居");
-        addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
+        addOutDoorAuthMap.put("authName", "app用户权限勿动");
+        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.selectById(e.getUuidId()).getConfigurationValue())
@@ -188,7 +198,7 @@ public class HKServiceImpl implements IHKService {
      * @param response
      * @param user
      */
-    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree) {
+    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk) {
         Map<String, Object> parDept = Maps.newHashMap();
         parDept.put("pageNo", 1);
         parDept.put("pageSize", 100);
@@ -196,17 +206,20 @@ public class HKServiceImpl implements IHKService {
         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", user.getHkPersonNo());
+        parUser.put("personNo", taUserHk.getHkPersonNo());
         parUser.put("personName", user.getUserName());
-        parUser.put("phoneNo", user.getLoginName());
+        // parUser.put("phoneNo", user.getLoginName());
         //parUser.put("deptUuid", deptUuid);
+        parUser.put("remark", user.getLoginName());
         parUser.put("secret", tpEquipmentTree.getSecret());
         parUser.put("appkey", tpEquipmentTree.getAppkey());
+        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
         int errorCode = (int) resultMap.get("errorCode");
@@ -216,9 +229,23 @@ public class HKServiceImpl implements IHKService {
             // 海康人员ID
             Integer personId = (Integer) resultDataMap.get("personId");
 
-            user.setHkUserId(personId);
+            taUserHk.setHkUserId(personId);
             // 存储海康人员ID
-            int row = taUserMapper.updateById(user);
+            int row = 0;
+            if (null == taUserHk.getId()) {
+                taUserHk.setTaUserId(user.getUserId());
+                taUserHk.setCommunityId(tpEquipmentTree.getCommunityId());
+                // 存储海康人员ID
+                row = taUserHkMapper.insert(taUserHk);
+                taUserHk.setCreateUser(taUserHk.getId());
+                taUserHk.setCreateDate(new Date());
+                taUserHkMapper.updateById(taUserHk);
+            } else {
+                taUserHk.setUpdateUser(taUserHk.getId());
+                taUserHk.setUpdateDate(new Date());
+                row = taUserHkMapper.updateById(taUserHk);
+            }
+
             if (row > 0) {
                 response.addSuccess("操作成功!");
             } else {
@@ -238,7 +265,7 @@ public class HKServiceImpl implements IHKService {
      * 添加卡片
      * @return
      */
-    public ResponseBean addCards(TaUser user, TpEquipmentTree tpEquipmentTree) {
+    public ResponseBean addCards(TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree) {
 
         ResponseBean response = new ResponseBean();
 
@@ -252,6 +279,7 @@ public class HKServiceImpl implements IHKService {
         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");
@@ -261,8 +289,8 @@ public class HKServiceImpl implements IHKService {
         }
 
         // 卡片入库
-        user.setHkCardNo(cardNo + "");
-        taUserMapper.updateById(user);
+        taUserHk.setHkCardNo(cardNo + "");
+        taUserHkMapper.updateById(taUserHk);
         return response;
     }
 
@@ -304,6 +332,7 @@ public class HKServiceImpl implements IHKService {
         parOpenCard.put("endTime", time);
         parOpenCard.put("secret", tpEquipmentTree.getSecret());
         parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
+        parOpenCard.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         parOpenCard.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
         int code = (int) openCardJSON.get("errorCode");
@@ -363,6 +392,7 @@ public class HKServiceImpl implements IHKService {
         downloadFingerMap.put("opType", 1);
         downloadFingerMap.put("personIds", map.get("personIds"));
         downloadFingerMap.put("longNums", map.get("longNums"));
+        downloadFingerMap.put("opUserUuid", map.get("opUserUuid"));
         downloadFingerMap.put("openapi_ip_port_http", map.get("openapi_ip_port_http"));
         // 可视对讲 指定人员指纹权限下载
         HKOpenApi.downloadFinger(downloadFingerMap);
@@ -399,6 +429,7 @@ public class HKServiceImpl implements IHKService {
         parMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         parMap.put("secret", tpEquipmentTree.getSecret());
         parMap.put("appkey", tpEquipmentTree.getAppkey());
+        parMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         String data = HKOpenApi.syncControl(parMap);
         JSONObject jsonObject = JSONObject.parseObject(data);
         int errorCode = jsonObject.getInteger("errorCode");

CODE/foreign-service/src/main/resources/mapper/TaUserHkMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TaUserHkMapper">
+
+</mapper>

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

@@ -0,0 +1,27 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaUserHk;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TaUserHkMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaUserHk record);
+
+    int insertSelective(TaUserHk record);
+
+    TaUserHk selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUserHk record);
+
+    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);
+
+}

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

@@ -0,0 +1,105 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaUserHk {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserId;
+
+    private Long hkPersonNo;
+
+    private Integer hkUserId;
+
+    private String hkCardNo;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public Long getHkPersonNo() {
+        return hkPersonNo;
+    }
+
+    public void setHkPersonNo(Long hkPersonNo) {
+        this.hkPersonNo = hkPersonNo;
+    }
+
+    public Integer getHkUserId() {
+        return hkUserId;
+    }
+
+    public void setHkUserId(Integer hkUserId) {
+        this.hkUserId = hkUserId;
+    }
+
+    public String getHkCardNo() {
+        return hkCardNo;
+    }
+
+    public void setHkCardNo(String hkCardNo) {
+        this.hkCardNo = hkCardNo == null ? null : hkCardNo.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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

@@ -76,6 +76,9 @@ public class FaceServicelimpl implements FaceServiceI {
     @Autowired
     private ToCommunitiesMapper toCommunitiesMapper;
 
+    @Autowired
+    private TaUserHkMapper taUserHkMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId) {
@@ -155,6 +158,9 @@ public class FaceServicelimpl implements FaceServiceI {
             userVerifyId = otherUserVerify.getId();
         }
 
+        // 海康数据
+        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userElement.getId(), userElement.getCommunityId());
+
         /**
          * 删除的时候，将所有的海康设备的关联关系删除了，需要重新下发一次
          */
@@ -173,7 +179,7 @@ public class FaceServicelimpl implements FaceServiceI {
         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());
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid(), taUserHk);
         if (resps.getCode().equals("0")) {
             resps.addSuccess((Object) faceImg);
         } else {
@@ -197,10 +203,10 @@ public class FaceServicelimpl implements FaceServiceI {
      * @param openapi_ip_port_http 海康服务器地址
      * @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) {
+    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) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
-        if (user.getHkUserId() == null) {
+        if (taUserHk.getHkUserId() == null) {
             responseBean.addError("海康人员ID不存在，无法录入");
             log.error("本地库人员ID：{}  的海康人员ID不存在", userId);
             return responseBean;
@@ -214,7 +220,7 @@ public class FaceServicelimpl implements FaceServiceI {
             Integer faceNum = (Integer) jsonObject.get("face_num");
 
             /*推送海康*/
-            String data = HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo(), appkey, secret, openapi_ip_port_http);
+            String data = HKOpenApi.HKpersonGroupId(uploadFile, taUserHk.getHkUserId(), taUserHk.getHkPersonNo(), user.getUserName(), taUserHk.getHkCardNo(), appkey, secret, openapi_ip_port_http, opUserUuid);
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
@@ -250,7 +256,7 @@ public class FaceServicelimpl implements FaceServiceI {
                     Map<String,Object> map = Maps.newHashMap();
                     map.put("appkey", tpEquipmentTree.getAppkey());
                     map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-                    map.put("personIds", String.valueOf(user.getHkUserId()));
+                    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());
@@ -260,7 +266,7 @@ public class FaceServicelimpl implements FaceServiceI {
 
                 //可视对讲时 指定人员人脸权限下载
                 List<Integer> userIdList = new ArrayList<>();
-                userIdList.add(user.getHkUserId());
+                userIdList.add(taUserHk.getHkUserId());
                 //临时设备编号
                 // TODO 根据期楼栋号，来查询出门口机
 
@@ -396,12 +402,15 @@ public class FaceServicelimpl implements FaceServiceI {
             return response;
         }
 
+        // 海康数据
+        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), 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());
+                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(),tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid(), taUserHk);
                 if (responseBean.getCode().equals("0")) {
                     responseBean.addSuccess("图片录入成功");
                 } else {

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

@@ -54,6 +54,9 @@ public class HKServiceImpl implements IHKService {
     @Autowired
     private TaRemotelyDoorMapper taRemotelyDoorMapper;
 
+    @Autowired
+    private TaUserHkMapper taUserHkMapper;
+
     /**
      * 获取设备UUID
      * @param equipmentList
@@ -79,30 +82,37 @@ public class HKServiceImpl implements IHKService {
         if (null == userVerify) {
             throw new WisdomException("审核数据不存在！");
         }
+
+        // 海康数据
+        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), userVerify.getCommunityId());
+        if (null == taUserHk) {
+            taUserHk = new TaUserHk();
+        }
+
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
 
         // 这两个值一般都是同时存在的
         // 当这两个值不存在的时候，就添加海康人员
-        if (null == user.getHkUserId() && null == user.getHkPersonNo()) {
+        if (null == taUserHk.getHkUserId() && null == taUserHk.getHkPersonNo()) {
             // 设置 海康id
-            user.setHkPersonNo(idGen.nextId());
+            taUserHk.setHkPersonNo(idGen.nextId());
             /**
              * 1.获取部门(比如 住户)
              * 2.根据部门编号推送 海康
              */
             taUserMapper.updateByPrimaryKeySelective(user);
-            addUserAndOpenCard(responseBean, user, tpEquipmentTree);
+            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk);
         }
 
         // 卡片操作
         // 没有卡片就开卡
-        if (StringUtils.isBlank(user.getHkCardNo())) {
+        if (StringUtils.isBlank(taUserHk.getHkCardNo())) {
 
             // 添加卡片
-            responseBean = addCards(user, tpEquipmentTree);
+            responseBean = addCards(taUserHk, tpEquipmentTree);
 
             // 开卡
-            responseBean = openCard(user.getHkUserId(), Long.valueOf(user.getHkCardNo()), null,tpEquipmentTree);
+            responseBean = openCard(taUserHk.getHkUserId(), Long.valueOf(taUserHk.getHkCardNo()), null,tpEquipmentTree);
 
         }
 
@@ -126,22 +136,24 @@ public class HKServiceImpl implements IHKService {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(doorUuids)) {
 
             Map<String, Object> map = Maps.newHashMap();
-            map.put("personIds",String.valueOf(user.getHkUserId()));
+            map.put("personIds",String.valueOf(taUserHk.getHkUserId()));
             map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
             map.put("secret", tpEquipmentTree.getSecret());
             map.put("appkey", tpEquipmentTree.getAppkey());
             map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
             HKOpenApi.addAuthoritiesByPersonIds(map);
 
             // 下发门禁权限
             Map<String, Object> downloadAuthorityByPersonIdsMap = Maps.newHashMap();
-            downloadAuthorityByPersonIdsMap.put("personIds",String.valueOf(user.getHkUserId()));
+            downloadAuthorityByPersonIdsMap.put("personIds",String.valueOf(taUserHk.getHkUserId()));
             downloadAuthorityByPersonIdsMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
             downloadAuthorityByPersonIdsMap.put("operateType",1);
             downloadAuthorityByPersonIdsMap.put("includeFinger",1);
             downloadAuthorityByPersonIdsMap.put("secret", tpEquipmentTree.getSecret());
             downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
             downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            downloadAuthorityByPersonIdsMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
             HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
 
         }
@@ -150,10 +162,11 @@ public class HKServiceImpl implements IHKService {
 
         Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
         addOutDoorAuthMap.put("authName", "app用户权限勿动");
-        addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
+        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);
@@ -189,7 +202,7 @@ public class HKServiceImpl implements IHKService {
      * @param response
      * @param user
      */
-    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree) {
+    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk) {
         Map<String, Object> parDept = Maps.newHashMap();
         parDept.put("pageNo", 1);
         parDept.put("pageSize", 100);
@@ -197,18 +210,21 @@ public class HKServiceImpl implements IHKService {
         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", user.getHkPersonNo());
+        parUser.put("personNo", taUserHk.getHkPersonNo());
         parUser.put("personName", user.getUserName());
-        parUser.put("phoneNo", user.getLoginName());
+        // parUser.put("phoneNo", user.getLoginName());
+        parUser.put("remark", user.getLoginName());
         //parUser.put("deptUuid", deptUuid);
         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) {
@@ -217,9 +233,18 @@ public class HKServiceImpl implements IHKService {
             // 海康人员ID
             Integer personId = (Integer) resultDataMap.get("personId");
 
-            user.setHkUserId(personId);
-            // 存储海康人员ID
-            int row = taUserMapper.updateByPrimaryKeySelective(user);
+            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 {
@@ -239,7 +264,7 @@ public class HKServiceImpl implements IHKService {
      * 添加卡片
      * @return
      */
-    public ResponseBean addCards(TaUser user, TpEquipmentTree tpEquipmentTree) {
+    public ResponseBean addCards(TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree) {
 
         ResponseBean response = new ResponseBean();
 
@@ -253,6 +278,7 @@ public class HKServiceImpl implements IHKService {
         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");
@@ -262,8 +288,8 @@ public class HKServiceImpl implements IHKService {
         }
 
         // 卡片入库
-        user.setHkCardNo(cardNo + "");
-        taUserMapper.updateByPrimaryKeySelective(user);
+        taUserHk.setHkCardNo(cardNo + "");
+        taUserHkMapper.updateByPrimaryKeySelective(taUserHk);
         return response;
     }
 
@@ -306,6 +332,7 @@ public class HKServiceImpl implements IHKService {
         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) {
@@ -365,6 +392,7 @@ public class HKServiceImpl implements IHKService {
         downloadFingerMap.put("personIds", map.get("personIds"));
         downloadFingerMap.put("longNums", map.get("longNums"));
         downloadFingerMap.put("openapi_ip_port_http", map.get("openapi_ip_port_http"));
+        downloadFingerMap.put("opUserUuid", map.get("opUserUuid"));
         // 可视对讲 指定人员指纹权限下载
         HKOpenApi.downloadFinger(downloadFingerMap);
     }
@@ -402,6 +430,7 @@ public class HKServiceImpl implements IHKService {
         parMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         parMap.put("secret", tpEquipmentTree.getSecret());
         parMap.put("appkey", tpEquipmentTree.getAppkey());
+        parMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         String data = HKOpenApi.syncControl(parMap);
         JSONObject jsonObject = JSONObject.parseObject(data);
         int errorCode = jsonObject.getInteger("errorCode");

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

@@ -104,7 +104,7 @@ public class MonitoringServiceImpl implements IMonitoringService {
 //
 //        response.addSuccess(urlList);
         ResponseBean response = new ResponseBean();
-        Page<TpEquipment> page = PageHelper.startPage(pageNo, pageSize);
+        Page<TpEquipment> page = PageHelper.startPage(pageNo, 100);
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityId(communityId);
 
         if (CollectionUtils.isEmpty(tpEquipments)) {
@@ -210,7 +210,7 @@ public class MonitoringServiceImpl implements IMonitoringService {
     @Override
     public ResponseBean getHlsByCommunityId(UserElement userElement, Integer communityId, Integer pageNo, Integer pageSize) {
         ResponseBean response = new ResponseBean();
-        Page<TpEquipment> page = PageHelper.startPage(pageNo, pageSize);
+        Page<TpEquipment> page = PageHelper.startPage(pageNo, 100);
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectHlsByCommunityId(communityId);
 
         if (CollectionUtils.isEmpty(tpEquipments)) {

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

@@ -170,6 +170,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private ToOperateTelMapper toOperateTelMapper;
 
+    @Autowired
+    private TaUserHkMapper taUserHkMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean login(String loginName, String code, HttpSession session) {
@@ -1080,6 +1083,15 @@ public class TaUserServiceImpl implements ITaUserService {
         taUserVO.setUserVerifyId(userVerify.getId());
         taUserVO.setVerifyStatus(userVerify.getVerifyStatus());
 
+        // 设置海康数据
+        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(taUserVO.getId(), userVerify.getCommunityId());
+        if (null != taUserHk) {
+            taUserVO.setHkUserId(taUserHk.getHkUserId() + "");
+            taUserVO.setHkPersonNo(taUserHk.getHkPersonNo() + "");
+            taUserVO.setHkCardNo(taUserHk.getHkCardNo());
+        }
+
+
         // 认证状态  0 是未审核   1是审核通过   2是审核不通过
         String verifyStatus = userVerify.getVerifyStatus();
         // 有一个审核通过的房产

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

@@ -103,4 +103,19 @@ public class TaUserVO {
      * 备注 /  审核不通过原因
      */
     private String remark;
+
+    /**
+     * 海康人员编号
+     */
+    private String hkPersonNo;
+
+    /**
+     * 海康用户id
+     */
+    private String hkUserId;
+
+    /**
+     * 海康卡片号码
+     */
+    private String hkCardNo;
 }

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

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaUserHkMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaUserHk" >
+    <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="hk_person_no" property="hkPersonNo" jdbcType="BIGINT" />
+    <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
+    <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_id, hk_person_no, hk_user_id, hk_card_no, create_user, 
+    create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_user_hk
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_user_hk
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaUserHk"  useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+    insert into ta_user_hk (id, community_id, ta_user_id, 
+      hk_person_no, hk_user_id, hk_card_no, 
+      create_user, create_date, update_user, 
+      update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
+      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, 
+      #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserHk" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+    insert into ta_user_hk
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="hkPersonNo != null" >
+        hk_person_no,
+      </if>
+      <if test="hkUserId != null" >
+        hk_user_id,
+      </if>
+      <if test="hkCardNo != null" >
+        hk_card_no,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkPersonNo != null" >
+        #{hkPersonNo,jdbcType=BIGINT},
+      </if>
+      <if test="hkUserId != null" >
+        #{hkUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkCardNo != null" >
+        #{hkCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUserHk" >
+    update ta_user_hk
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkPersonNo != null" >
+        hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
+      </if>
+      <if test="hkUserId != null" >
+        hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkCardNo != null" >
+        hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaUserHk" >
+    update ta_user_hk
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
+      hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -1,6 +1,7 @@
 package com.community.commom.hk;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
@@ -99,7 +100,8 @@ public class HKOpenApi {
         parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
         parMap.put("personNo",map.get("personNo"));
         parMap.put("personName",map.get("personName"));
-        parMap.put("phoneNo",map.get("phoneNo"));
+        // parMap.put("phoneNo",map.get("phoneNo"));
+        parMap.put("remark", map.get("remark"));
         parMap.put("deptUuid",map.get("deptUuid"));
         // parMap.put("cardNo",map.get("cardNo"));
         String params =  JSON.toJSONString(parMap);
@@ -498,7 +500,7 @@ public class HKOpenApi {
      *  * personName 卡号
      * @return
      */
-    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Long personNo,String personName,String cardNo, String  appkey, String secret, String openapi_ip_port_http) {
+    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Long personNo,String personName,String cardNo, String  appkey, String secret, String openapi_ip_port_http, String opUserUuid) {
         byte [] fileByte = new byte[0];
         try {
             if (null!=faceImg) {
@@ -515,7 +517,7 @@ public class HKOpenApi {
         map.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         map.put("time", System.currentTimeMillis());
 //        map.put("token",map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret")));
-        map.put("opUserUuid", HKConstant.OP_USER_UUID);
+        map.put("opUserUuid", opUserUuid == null ? HKConstant.OP_USER_UUID : opUserUuid);
         map.put("personId", personId);
         map.put("personNo", personNo);
         map.put("personName", personName);
@@ -993,29 +995,18 @@ public class HKOpenApi {
     }
 
     public static void main(String[] args) {
-//         getDefaultUserUuid();
-        Map<String,Object> parMap = Maps.newHashMap();
-        String url = "http://qsp80.ngrok.jcjyhn.com:8888" + HKConstant.ITF_MONITORY_POINT;
-        //设置APPKEY
-        parMap.put("appkey", "d30396a0");
-        //设置时间参数
-        parMap.put("time", System.currentTimeMillis());
-        parMap.put("pageNo","1");
-        parMap.put("pageSize","100");
-        parMap.put("opUserUuid","5b2eb534696b11e89c2e438f92627767");
-        parMap.put("unitUuids","1048576");
-        String params =  JSON.toJSONString(parMap);
-        log.info("获取 监控列表 请求参数：{}", params);
-        String data = null;
-        try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, "6a939cf0b2914004a2755e70c6c96e02"), params);
-            log.info("获取 监控列表 请求返回结果：{}",data);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("获取监控列表失败!",e);
-            throw new RuntimeException("获取监控列表失败!");
-        }
-        //getDoorsByRegionUuids();
+       // 添加人员
+        Map<String, Object> parUser = Maps.newHashMap();
+        parUser.put("personNo", "13");
+        parUser.put("personName", "测试备注");
+        // parUser.put("phoneNo", user.getLoginName());
+        parUser.put("remark", "15871301022");
+        //parUser.put("deptUuid", deptUuid);
+        parUser.put("secret", "64a1f32d53784ce2a34bd81822db1b91");
+        parUser.put("appkey", "b4434b13");
+        parUser.put("opUserUuid", "5b2eb534696b11e89c2e438f92627767");
+        parUser.put("openapi_ip_port_http", "http://222.190.241.190:888");
+        System.out.println(HKOpenApi.addUser(parUser));
     }
     /**
      *     删除当前人脸设备信息

CODE/smart-community/community-common/src/main/java/com/community/commom/session/UserElement.java

@@ -57,6 +57,21 @@ public class UserElement implements Serializable {
     /** 当前登录 户号id **/
     private Integer roomNoId;
 
+    /**
+     * 海康人员编号
+     */
+    private String hkPersonNo;
+
+    /**
+     * 海康用户id
+     */
+    private String hkUserId;
+
+    /**
+     * 海康卡片号码
+     */
+    private String hkCardNo;
+
     @Override
     public String toString() {
         return "UserElement{" +
@@ -73,6 +88,9 @@ public class UserElement implements Serializable {
                 ", unitId=" + unitId +
                 ", levelId=" + levelId +
                 ", roomNoId=" + roomNoId +
+                ", hkPersonNo='" + hkPersonNo + '\'' +
+                ", hkUserId='" + hkUserId + '\'' +
+                ", hkCardNo='" + hkCardNo + '\'' +
                 '}';
     }
 }

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

@@ -126,22 +126,13 @@ public class HkDoorsController {
             videoConfiguration.setCommunityId(communityId);
             videoConfiguration.setDoorUuid(null);
             videoConfiguration.setDeviceUuid(doorJson.getString("deviceUuid"));
-//            videoConfiguration.setDeviceType(1);
             tpConfigurationService.save(videoConfiguration);
 
             //插入设备
-            TpEquipment videoEquipment = new TpEquipment();
-            videoEquipment.setCommunityId(communityId);
-            videoEquipment.setCreateTime(LocalDateTime.now());
-            videoEquipment.setCreateUser(1);
-            videoEquipment.setUpdateTime(LocalDateTime.now());
-            videoEquipment.setUpdateUser(1);
-            videoEquipment.setEquipmentType("5");
-            videoEquipment.setUuidId(videoConfiguration.getId());
-            videoEquipment.setEquipmentTreeId(equipmentTreeId);
-            videoEquipment.setAppkey("dbeb0f364e9149c19b06a858c5bb7c29");
-            videoEquipment.setSecret("0b1933480ffbf01e9e5e5f4447033d12");
-            tpEquipmentService.save(videoEquipment);
+            tpEquipment.setUrlId(videoConfiguration.getId());
+            tpEquipment.setAppkey("dbeb0f364e9149c19b06a858c5bb7c29");
+            tpEquipment.setSecret("0b1933480ffbf01e9e5e5f4447033d12");
+            tpEquipmentService.updateById(tpEquipment);
         }
 
     }

文档/MYSQL/smartCommunity.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1560136364" Name="smartCommunity" Objects="1289" Symbols="142" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1560136364" Name="smartCommunity" Objects="1278" Symbols="142" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1560136364" Name="smartCommunity" Objects="1289" Symbols="142" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1560136364" Name="smartCommunity" Objects="1278" Symbols="142" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">