提交

CODE/foreign-service/src/main/java/com/community/huiju/enums/ResponseErrorsMessages.java

@@ -37,6 +37,8 @@ public enum ResponseErrorsMessages {
     NOT_EQUIPMENT(1025, "系统设备未设置！"),
     NOT_PERMISSIONS_SET(1025, "权限组未配置！"),
     ERROR_ID_CARD(1026, "身份证不合法！"),
+    NO_HK_AUTH(1027, "海康权限信息 未配置"),
+    NO_ET(1027, "设备树 未配置"),
     ;
 
 

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

@@ -2,10 +2,7 @@ package com.community.huiju.service;
 
 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;
+import com.community.huiju.model.*;
 
 /**
  * 海康 业务
@@ -36,7 +33,7 @@ public interface IHKService {
      * 下发 可视对讲 权限
      * @return
      */
-    ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify);
+    ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify, TaUser user);
 
 
 }

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

@@ -72,6 +72,9 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
     @Autowired
     private TaUserHkMapper taUserHkMapper;
 
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(Integer userId, Integer userVerifyId, MultipartFile uploadFile) {
@@ -83,8 +86,6 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
             return responseBean;
         }
 
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
-
         // 当前人脸图片url
         String faceImg = img(uploadFile);
 
@@ -105,7 +106,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         taFace.setUpdateDate(new Date());
 
         /*验证身份*/
-        responseBean = addVerify(userId, userVerifyId, uploadFile, faceImg, taFace, tpEquipmentTree);
+        responseBean = addVerify(userId, userVerifyId, uploadFile, faceImg, taFace);
         return responseBean;
     }
 
@@ -128,7 +129,6 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
             return responseBean;
         }
 
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
         // 人脸图片地址url
         String faceImg = img(uploadFile);
 
@@ -141,6 +141,12 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         // 海康数据
         TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getUserVerifyId(), userVerify.getCommunityId());
 
+        // 海康权限信息
+        TpUnitHkSetting tpUnitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
+        // 设备树
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
         //当前修改的id否存在
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
         if (null == face) {
@@ -152,7 +158,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(), tpEquipmentTree.getOpUserUuid(), taUserHk);
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, tpUnitHkSetting, userVerify, tpEquipmentTree, taUserHk);
         if (resps.getCode().equals("0")) {
             resps.addSuccess(face);
         } else {
@@ -167,20 +173,34 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
      * @param taFace
      * @param isA
      * @param uploadFile
-     * @param userId
-     * @param communityId
-     * @param roomNoId
-     * @param unitId
-     * @param appkey
-     * @param secret
-     * @param openapi_ip_port_http 海康服务器地址
+     * @param unitHkSetting
+     * @param userVerify
+     * @param tpEquipmentTree
+     * @param taUserHk
      * @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, TpUnitHkSetting unitHkSetting , TaUserVerify userVerify, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk) {
         ResponseBean responseBean = new ResponseBean();
-        TaUser user = taUserMapper.selectById(userId);
+
+        if (null == unitHkSetting) {
+            responseBean.addError(ResponseErrorsMessages.NO_HK_AUTH.getCode(), ResponseErrorsMessages.NO_HK_AUTH.getMsg());
+            return responseBean;
+        }
+
+        if (null == tpEquipmentTree) {
+            responseBean.addError(ResponseErrorsMessages.NO_ET.getCode(), ResponseErrorsMessages.NO_ET.getMsg());
+            return responseBean;
+        }
+
+        if (null == userVerify) {
+            responseBean.addError(ResponseErrorsMessages.NOT_VERIFY.getCode(), ResponseErrorsMessages.NOT_VERIFY.getMsg());
+            return responseBean;
+        }
+
+
+        TaUser user = taUserMapper.selectById(userVerify.getUserId());
         if (taUserHk.getHkUserId() == null) {
-            log.error("本地库人员ID：{}  的海康人员ID不存在", userId);
+            log.error("本地库人员ID：{}  的海康人员ID不存在", userVerify.getUserId());
             throw new WisdomException(ResponseErrorsMessages.NOT_PUSH_FACE.getCode(), ResponseErrorsMessages.NOT_PUSH_FACE.getMsg());
         }
         AESDecode aesd = new AESDecode();
@@ -192,25 +212,39 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
             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());
+
+            // 等待 1s
+            Thread.sleep(1000);
+
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
-                    log.error("未得到，海康数据反馈！");
-                    throw new WisdomException(ResponseErrorsMessages.NOT_PUSH_FACE.getCode(), ResponseErrorsMessages.NOT_PUSH_FACE.getMsg());
+                    log.error("海康人脸推送失败！");
+                    throw new RuntimeException("人脸推送失败！");
                 }
+
+                // 下发卡权限
+                // 下发可是对讲卡权限
+                ihkService.visualIntercomPermissions(unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user);
+
                 if (isA) {
                     taFaceMapper.insert(taFace);
                 } else {
                     taFaceMapper.updateById(taFace);
                 }
+
+                // 等待 1s
+                Thread.sleep(3000);
+
+                responseBean.addSuccess("操作成功");
+
                 responseBean.addSuccess(taFace);
 
-                // 设备树
-                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();
@@ -235,7 +269,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
                 }
 
                 // 单元门口机
-                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.selectById(e.getUuidId()).getConfigurationValue())
@@ -318,7 +352,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
     /**
      * 各种身份校验
      */
-    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.selectById(userVerifyId);
@@ -337,12 +371,19 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         // 海康数据
         TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getUserVerifyId(), 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, tpUnitHkSetting, userVerify,tpEquipmentTree, taUserHk);
                 if (responseBean.getCode().equals("0")) {
                     responseBean.addSuccess("人脸录入成功");
                 } else {
@@ -355,6 +396,18 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         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
     public ResponseBean deleteFace(Integer userId, Integer userVerifyId) {
         ResponseBean responseBean= new ResponseBean();

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

@@ -417,7 +417,7 @@ public class HKServiceImpl implements IHKService {
     }
 
     @Override
-    public ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify) {
+    public ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify, TaUser user) {
 
         ResponseBean responseBean = new ResponseBean();
 
@@ -440,7 +440,7 @@ public class HKServiceImpl implements IHKService {
 
         Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
         // app用户权限勿动
-        addOutDoorAuthMap.put("authName", unitHkSetting.getPermissionId());
+        addOutDoorAuthMap.put("authName", user.getUserName() + userVerify.getUserVerifyId());
         addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
         addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
         addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());

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

@@ -258,7 +258,7 @@ public class FaceServicelimpl implements FaceServiceI {
                 // 等待 1s
                 Thread.sleep(3000);
 
-                responseBean.addSuccess("操作成功");
+                responseBean.addSuccess(taFace);
 
 
                 // 所有设备