大苏接口，门口机调整

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;
@@ -31,15 +28,15 @@ public class TaFceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
-            @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+            //@ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
     })
     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);
@@ -53,15 +50,15 @@ public class TaFceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
-            @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+            //@ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
     })
     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);
@@ -74,10 +71,10 @@ public class TaFceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
     })
     public ResponseBean deleteFace(@RequestParam(value = "userId") Integer userId,
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {

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

@@ -29,7 +29,7 @@ import java.util.TreeMap;
  *
  * @author weiximei on 2019-05-17
  */
-@Component
+//@Component
 @Slf4j
 public class SignFilter implements Filter {
 

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;
@@ -144,7 +146,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());
         if (resps.getCode().equals("0")) {
             resps.addSuccess(face);
         } else {
@@ -168,7 +170,7 @@ 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) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectById(userId);
         if (user.getHkUserId() == null) {
@@ -184,7 +186,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, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo(), appkey, secret, openapi_ip_port_http, opUserUuid);
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
@@ -328,7 +330,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         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());
                 if (responseBean.getCode().equals("0")) {
                     responseBean.addSuccess("人脸录入成功");
                 } else {
@@ -351,69 +353,112 @@ 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;
+        }
+
+
         // 设备树
         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", 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> 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);
+
+        }
+
+        // 门口机删除人脸
+        // 单元门口机
+        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(taUser.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

@@ -196,6 +196,7 @@ 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);
 
@@ -207,6 +208,7 @@ public class HKServiceImpl implements IHKService {
         //parUser.put("deptUuid", deptUuid);
         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");
@@ -252,6 +254,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");
@@ -304,6 +307,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 +367,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 +404,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");