完成 设备更改

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

@@ -44,9 +44,9 @@ public class HkController {
 	}
 
 	@RequestMapping(value = "/pushHKPerson/{appUserId}", method = RequestMethod.POST)
-	public ResponseBean pushHKPerson(@PathVariable("appUserId") String appUserId) {
+	public ResponseBean pushHKPerson(@PathVariable("appUserId") String appUserId, @RequestParam("userVerifyId") Integer userVerifyId) {
 		ResponseBean responseBean = new ResponseBean();
-		responseBean = ihkService.pushPerson(appUserId);
+		responseBean = ihkService.pushPerson(appUserId, userVerifyId);
 		return responseBean;
 	}
 

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

@@ -1,7 +1,9 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpConfiguration;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface TpConfigurationMapper {
     int deleteByPrimaryKey(Integer id);
 

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

@@ -35,4 +35,18 @@ public interface TpEquipmentMapper {
             "tp_equipment tm " +
             "where tm.community_id = #{communityId} and tm.equipment_type = 1")
     List<TpEquipment> selectByCommunityId(@Param("communityId") Integer communityId);
+
+    /**
+     * 根据小区 和 房间号 查询所有设备
+     * @param communityId
+     * @param roomNoId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select " +
+            "te.* " +
+            "from tp_room_no_equipment trne left join tp_equipment te " +
+            "on trne.equipment_id = te.id " +
+            "where trne.community_id=#{communityId} and trne.room_no_id=#{roomNoId} and te.equipment_type=#{equipmentType}")
+    List<TpEquipment> selectByCommunityIdAndRoomNoId(@Param("communityId") Integer communityId, @Param("roomNoId") Integer roomNoId, @Param("equipmentType") Integer equipmentType);
 }

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

@@ -0,0 +1,22 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpRoomNoEquipment;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface TpRoomNoEquipmentMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpRoomNoEquipment record);
+
+    int insertSelective(TpRoomNoEquipment record);
+
+    TpRoomNoEquipment selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpRoomNoEquipment record);
+
+    int updateByPrimaryKey(TpRoomNoEquipment record);
+
+}

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

@@ -23,6 +23,10 @@ public class TpConfiguration {
 
     private Integer communityId;
 
+    private String dooruuid;
+
+    private String deviceuuid;
+
     public Integer getId() {
         return id;
     }
@@ -102,4 +106,20 @@ public class TpConfiguration {
     public void setCommunityId(Integer communityId) {
         this.communityId = communityId;
     }
+
+    public String getDooruuid() {
+        return dooruuid;
+    }
+
+    public void setDooruuid(String dooruuid) {
+        this.dooruuid = dooruuid == null ? null : dooruuid.trim();
+    }
+
+    public String getDeviceuuid() {
+        return deviceuuid;
+    }
+
+    public void setDeviceuuid(String deviceuuid) {
+        this.deviceuuid = deviceuuid == null ? null : deviceuuid.trim();
+    }
 }

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

@@ -0,0 +1,55 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpRoomNoEquipment {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer roomNoId;
+
+    private Integer equipmentId;
+
+    private Date createDate;
+
+    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 getRoomNoId() {
+        return roomNoId;
+    }
+
+    public void setRoomNoId(Integer roomNoId) {
+        this.roomNoId = roomNoId;
+    }
+
+    public Integer getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Integer equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -13,7 +13,7 @@ public interface IHKService {
      * @param appUserId
      * @return
      */
-    ResponseBean pushPerson(String appUserId);
+    ResponseBean pushPerson(String appUserId, Integer userVerifyId);
 
     /**
      * 下发门禁权限

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

@@ -7,18 +7,13 @@ import com.community.commom.hk.HKOpenApi;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.welcome.WelcomeProperties;
-import com.community.huiju.dao.TaFaceMapper;
-import com.community.huiju.dao.TaSysRoleMapper;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TaUserVerifyMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
-import com.community.huiju.model.TaFace;
-import com.community.huiju.model.TaSysRole;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TaUserVerify;
+import com.community.huiju.model.*;
 import com.community.huiju.service.FaceServiceI;
 import com.community.huiju.service.IHKService;
 import com.community.huiju.service.ImageServiceI;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
@@ -34,6 +29,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service("faceServicel")
 @Transactional
@@ -62,9 +59,19 @@ public class FaceServicelimpl implements FaceServiceI {
     @Autowired
     private IHKService ihkService;
 
+    @Autowired
+    private TpEquipmentMapper tpEquipmentMapper;
+
+    @Autowired
+    private TpConfigurationMapper tpConfigurationMapper;
+
+    @Autowired
+    private TpEquipmentTreeMapper tpEquipmentTreeMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId ,Integer verifyID) {
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
         ResponseBean responseBean = new ResponseBean();
         /*审核房产是否通过*/
         TaUserVerify taUserVerify= infoExist(verifyID);
@@ -97,7 +104,7 @@ public class FaceServicelimpl implements FaceServiceI {
          * 删除的时候，将所有的海康设备的关联关系删除了，需要重新下发一次
          */
         // 下发门禁
-        ihkService.pushPerson(activeUser + "");
+        ihkService.pushPerson(activeUser + "", taUserVerify.getId());
 
         TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
         TaFace taFace = new TaFace();
@@ -110,7 +117,7 @@ public class FaceServicelimpl implements FaceServiceI {
         taFace.setUpdateDate(new Date());
 
         /*验证身份*/
-        responseBean = addVerify(activeUser, userVerifyId, uploadFile, faceImg, taFace);
+        responseBean = addVerify(activeUser, userVerifyId, uploadFile, faceImg, taFace, tpEquipmentTree);
         return responseBean;
     }
 
@@ -125,6 +132,7 @@ public class FaceServicelimpl implements FaceServiceI {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean upDateFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId) {
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
         ResponseBean responseBean = new ResponseBean();
         // 人脸图片地址url
         String faceImg = img(uploadFile);
@@ -139,8 +147,9 @@ public class FaceServicelimpl implements FaceServiceI {
         /**
          * 删除的时候，将所有的海康设备的关联关系删除了，需要重新下发一次
          */
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
         // 下发门禁
-        ihkService.pushPerson(activeUser + "");
+        ihkService.pushPerson(activeUser + "", userVerifyId);
 
         //当前修改的id否存在
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
@@ -152,7 +161,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);
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
         if (resps.getCode().equals("0")) {
             resps.addSuccess((Object) faceImg);
         } else {
@@ -164,7 +173,7 @@ public class FaceServicelimpl implements FaceServiceI {
     /**
      * 验证图片是否为人脸，推送海康
      */
-    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId) {
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, String  appkey, String secret) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
         if (user.getHkUserId() == null) {
@@ -181,7 +190,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());
+            String data = HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo(), appkey, secret);
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
@@ -193,7 +202,28 @@ public class FaceServicelimpl implements FaceServiceI {
                     taFaceMapper.updateByPrimaryKeySelective(taFace);
                 }
                 responseBean.addSuccess("操作成功");
-                HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
+
+                // 设备树
+                TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
+                // 所有设备
+                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndRoomNoId(communityId, roomNoId, 4);
+                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(",");
+                });
+                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("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
+                map.put("type", 1);
+                HKOpenApi.downloadFaceAndFingerInfos(map);
+
                 //可视对讲时 指定人员人脸权限下载
                 List<Integer> userIdList = new ArrayList<>();
                 userIdList.add(user.getHkUserId());
@@ -201,7 +231,7 @@ public class FaceServicelimpl implements FaceServiceI {
                 // TODO 根据期楼栋号，来查询出门口机
                 List<String> visualList = new ArrayList<>();
                 visualList.add("10010100000");
-                HKOpenApi.visualIntercom(null, 1, userIdList, visualList);
+                HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
             } else {
                 responseBean.addError("请录入正确图片");
             }
@@ -213,6 +243,21 @@ public class FaceServicelimpl implements FaceServiceI {
         return responseBean;
     }
 
+    /**
+     * 获取设备UUID
+     * @param equipmentList
+     * @return
+     */
+    private List<Map<String,Object>> getEquipmentUUID(List<TpEquipment> equipmentList) {
+        return equipmentList.stream().map(equipment -> {
+            TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(equipment.getUuidId());
+            Map<String,Object> map = Maps.newHashMap();
+            map.put("doorUuid", tpConfiguration.getDooruuid());
+            map.put("deviceUuid", tpConfiguration.getDeviceuuid());
+            return map;
+        }).collect(Collectors.toList());
+    }
+
     /**
      * 当前登入人是否有人脸信息
      */
@@ -269,7 +314,7 @@ public class FaceServicelimpl implements FaceServiceI {
     /**
      * 各种身份校验
      */
-    public ResponseBean addVerify(Integer userid, Integer userVerifyId, MultipartFile uploadFile, String faceImg, TaFace taFace) {
+    public ResponseBean addVerify(Integer userid, Integer userVerifyId, MultipartFile uploadFile, String faceImg, TaFace taFace, TpEquipmentTree tpEquipmentTree) {
         ResponseBean response = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
@@ -290,7 +335,7 @@ public class FaceServicelimpl implements FaceServiceI {
         if (null == face) {
             boolean isA = true;
             if (Constant.EFFECTIVE_STATUS.equals(taUser.getStatus())) {
-                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid);
+                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
                 if (responseBean.getCode().equals("0")) {
                     responseBean.addSuccess("图片录入成功");
                 } else {
@@ -365,12 +410,42 @@ public class FaceServicelimpl implements FaceServiceI {
             return responseBean;
         }
             TaUser taUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
+
+        // 设备树
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(taUserVerify.getCommunityId());
+        // 所有设备
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndRoomNoId(taUserVerify.getCommunityId(), taUserVerify.getRoomNoId(), 4);
+        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());
+        HKOpenApi.HKpersonGroupId(null, taUser.getHkUserId(), taUser.getHkPersonNo(), taUser.getUserName(), taUser.getHkCardNo(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
         // 删除 权限
-        HKOpenApi.selectUserFace(taUser.getHkUserId());
-        String data= HKOpenApi.deleteUser(taUser.getHkUserId());
+        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());
+        // 查询人脸信息
+        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());
+        // 删除当前人脸设备信息
+        String data= HKOpenApi.deleteUser(deleteUserMap);
         JSONObject object= JSONObject.parseObject(data);
 
         if (object.get("errorCode").equals(1)){

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

@@ -6,9 +6,9 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.uuid.IdGen;
 import com.community.commom.hk.HKOpenApi;
-import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
-import com.community.huiju.model.TaUser;
+import com.community.huiju.model.*;
 import com.community.huiju.service.IHKService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -21,10 +21,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 海康 业务实现
@@ -39,11 +37,45 @@ public class HKServiceImpl implements IHKService {
 
     private IdGen idGen = IdGen.get();
 
+    @Autowired
+    private TpEquipmentMapper tpEquipmentMapper;
+
+    @Autowired
+    private TpConfigurationMapper tpConfigurationMapper;
+
+    @Autowired
+    private TpEquipmentTreeMapper tpEquipmentTreeMapper;
+
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
+    /**
+     * 获取设备UUID
+     * @param equipmentList
+     * @return
+     */
+    private List<Map<String,Object>> getEquipmentUUID(List<TpEquipment> equipmentList) {
+        return equipmentList.stream().map(equipment -> {
+            TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(equipment.getUuidId());
+            Map<String,Object> map = Maps.newHashMap();
+            map.put("doorUuid", tpConfiguration.getDooruuid());
+            map.put("deviceUuid", tpConfiguration.getDeviceuuid());
+            return map;
+        }).collect(Collectors.toList());
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean pushPerson(String appUserId) {
+    public ResponseBean pushPerson(String appUserId, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(Integer.parseInt(appUserId));
+
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
+        if (null == userVerify) {
+            throw new WisdomException("审核数据不存在！");
+        }
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
         // 这两个值一般都是同时存在的
         // 当这两个值不存在的时候，就添加海康人员
         if (null == user.getHkUserId() && null == user.getHkPersonNo()) {
@@ -54,21 +86,54 @@ public class HKServiceImpl implements IHKService {
              * 2.根据部门编号推送 海康
              */
             taUserMapper.updateByPrimaryKeySelective(user);
-            addUserAndOpenCard(responseBean, user);
+            addUserAndOpenCard(responseBean, user, tpEquipmentTree);
         }
 
 
-
         // 推送海康
 
         // 给用户添加 海康门禁权限
-        HKOpenApi.addAuthoritiesByPersonIds(String.valueOf(user.getHkUserId()));
+
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndRoomNoId(userVerify.getCommunityId(), userVerify.getRoomNoId(), 4);
+        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(",");
+        });
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("personIds",String.valueOf(user.getHkUserId()));
+        map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
+        map.put("secret", tpEquipmentTree.getSecret());
+        map.put("appkey", tpEquipmentTree.getAppkey());
+        HKOpenApi.addAuthoritiesByPersonIds(map);
 
         // 下发门禁权限
-        downloadAuthorityByDeviceUuids();
+        Map<String, Object> downloadAuthorityByPersonIdsMap = Maps.newHashMap();
+        downloadAuthorityByPersonIdsMap.put("personIds",String.valueOf(user.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());
+        HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
 
         //--------- 可视对讲 ----------
-        visualIntercom(user);
+
+        Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
+        addOutDoorAuthMap.put("authName", "荟居");
+        addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
+        addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
+        addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+        List<String> visualList = new ArrayList<>();
+        visualList.add("10010100000");
+        addOutDoorAuthMap.put("longNums", visualList);
+        // 可视对讲下发 权限
+        visualIntercomPermissions(addOutDoorAuthMap);
         if ("0".equals(responseBean.getCode())) {
             responseBean.addSuccess("操作成功！");
             return responseBean;
@@ -80,7 +145,7 @@ public class HKServiceImpl implements IHKService {
     public ResponseBean downloadAuthorityByDeviceUuids() {
         ResponseBean responseBean = new ResponseBean();
         // 下发门禁权限
-        HKOpenApi.downloadAuthorityByDeviceUuids();
+        HKOpenApi.downloadAuthorityByDeviceUuids(Maps.newHashMap());
         responseBean.addSuccess("操作成功！");
         return responseBean;
     }
@@ -92,7 +157,7 @@ public class HKServiceImpl implements IHKService {
      * @param response
      * @param user
      */
-    private void addUserAndOpenCard(ResponseBean response, TaUser user) {
+    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree) {
         Map<String, Object> parDept = Maps.newHashMap();
         parDept.put("pageNo", 1);
         parDept.put("pageSize", 100);
@@ -106,6 +171,8 @@ public class HKServiceImpl implements IHKService {
         parUser.put("personName", user.getUserName());
         parUser.put("phoneNo", user.getLoginName());
         parUser.put("deptUuid", deptUuid);
+        parUser.put("secret", tpEquipmentTree.getSecret());
+        parUser.put("appkey", tpEquipmentTree.getAppkey());
         Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
         int errorCode = (int) resultMap.get("errorCode");
         if (errorCode == 0) {
@@ -131,7 +198,7 @@ public class HKServiceImpl implements IHKService {
             // 开卡
             List<String> cardAndPersonList = Lists.newArrayList();
             cardAndPersonList.add(cardNo + "," + personId);
-            response = openCard(cardAndPersonList, null);
+            response = openCard(cardAndPersonList, null, tpEquipmentTree);
         } else {
             String errorMessage = String.valueOf(resultMap.get("errorMessage"));
             response.addError(errorMessage);
@@ -147,7 +214,7 @@ public class HKServiceImpl implements IHKService {
      * @param expirationTime    有效期为多少? 单位为 年
      * @return
      */
-    private ResponseBean openCard(List<String> cardIdAndHKUserID, Integer expirationTime) {
+    private ResponseBean openCard(List<String> cardIdAndHKUserID, Integer expirationTime, TpEquipmentTree tpEquipmentTree) {
         ResponseBean response = new ResponseBean();
 
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
@@ -174,6 +241,8 @@ public class HKServiceImpl implements IHKService {
         parOpenCard.put("cardAndPerson", cardIdAndHKUserID);
         parOpenCard.put("startTime", System.currentTimeMillis());
         parOpenCard.put("endTime", time);
+        parOpenCard.put("secret", tpEquipmentTree.getSecret());
+        parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
         JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
         int code = (int) openCardJSON.get("errorCode");
         if (code == 0) {
@@ -206,32 +275,33 @@ public class HKServiceImpl implements IHKService {
     }
 
     /**
-     * 可视对讲下发
+     * 可视对讲下发 权限
      *
-     * @param user
+     * @param map
      */
-    private void visualIntercom(TaUser user) {
+    private void visualIntercomPermissions(Map<String,Object> map) {
         // TODO 目前下发的 authName权限组是我们自定义的, 后面肯定是按照小区的 期楼栋号来设置的
         // TODO longNums设备编号, 可视对讲的机器编号, 应该根据 期楼栋号 下面的机器编号来设置的
 
         //--------- 可视对讲 ----------
 
         // 可视对讲 根据人员 ID 集添加权限并下发
-        Map<String, Object> addOutDoorAuthMap = new HashMap<>();
-        addOutDoorAuthMap.put("authName", "荟居");
-        addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
-        addOutDoorAuthMap.put("longNums", Arrays.asList("10010100000"));
-        // 可视对讲 根据人员 ID 集添加权限并下发
-        HKOpenApi.addOutDoorAuth(addOutDoorAuthMap);
+        HKOpenApi.addOutDoorAuth(map);
 
-        // 可视对讲 指定人员指纹权限下载
-//        Map<String, Object> downloadFingerMap = new HashMap<>();
-//        // opType 操作类型 Integer 是 1 为下发权限；2 为删除权限
-//        downloadFingerMap.put("opType", 1);
-//        downloadFingerMap.put("personIds", Arrays.asList(user.getHkUserId()));
-//        downloadFingerMap.put("longNums", Arrays.asList("10010100000"));
-//        // 可视对讲 指定人员指纹权限下载
-//        HKOpenApi.downloadFinger(downloadFingerMap);
+    }
 
+    /**
+     * 可视对讲 指定人员指纹权限下载
+     * @param map
+     */
+    private void visualIntercomFingerprint(Map<String,Object> map) {
+        // 可视对讲 指定人员指纹权限下载
+        Map<String, Object> downloadFingerMap = new HashMap<>();
+        // opType 操作类型 Integer 是 1 为下发权限；2 为删除权限
+        downloadFingerMap.put("opType", 1);
+        downloadFingerMap.put("personIds", map.get("personIds"));
+        downloadFingerMap.put("longNums", map.get("longNums"));
+        // 可视对讲 指定人员指纹权限下载
+        HKOpenApi.downloadFinger(downloadFingerMap);
     }
 }

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

@@ -53,6 +53,7 @@ import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.logging.SimpleFormatter;
+import java.util.stream.Collectors;
 
 import static com.community.commom.constant.Constant.OWNER;
 
@@ -110,6 +111,13 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private DaSuProperties daSuProperties;
 
+
+    @Autowired
+    private TpConfigurationMapper tpConfigurationMapper;
+
+    @Autowired
+    private TpEquipmentMapper tpEquipmentMapper;
+
     /**
      * 期
      */
@@ -542,7 +550,7 @@ public class TaUserServiceImpl implements ITaUserService {
         }
 
         // 推送海康
-        response = ihkService.pushPerson(user.getId()+"");
+        response = ihkService.pushPerson(user.getId()+"", userVerify.getId());
         if ("1".equals(response.getCode())) {
             throw new WisdomException("推送HK失败！");
         }
@@ -675,11 +683,25 @@ public class TaUserServiceImpl implements ITaUserService {
         updateUser(response, user);
 
         // 下发门禁权限
-        HKOpenApi.downloadAuthorityByDeviceUuids();
-
+//         HKOpenApi.downloadAuthorityByDeviceUuids();
         return response;
     }
 
+    /**
+     * 获取设备UUID
+     * @param equipmentList
+     * @return
+     */
+    private List<Map<String,Object>> getEquipmentUUID(List<TpEquipment> equipmentList) {
+        return equipmentList.stream().map(equipment -> {
+            TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(equipment.getUuidId());
+            Map<String,Object> map = Maps.newHashMap();
+            map.put("doorUuid", tpConfiguration.getDooruuid());
+            map.put("deviceUuid", tpConfiguration.getDeviceuuid());
+            return map;
+        }).collect(Collectors.toList());
+    }
+
 
 
     /**

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

@@ -305,7 +305,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
                 tpMessageMapper.insert(message);
             }
             // 推送海康
-            responseBean = ihkService.pushPerson(user.getId()+"");
+            responseBean = ihkService.pushPerson(user.getId()+"", userVerify.getId());
             if ("1".equals(responseBean.getCode())) {
                 throw new WisdomException("推送HK失败！");
             }

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

@@ -8,9 +8,11 @@ import com.community.commom.hk.HKOpenApi;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TaVisitorLicenseMapper;
 import com.community.huiju.dao.TaVisitorMapper;
+import com.community.huiju.dao.TpEquipmentTreeMapper;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TaVisitor;
 import com.community.huiju.model.TaVisitorLicense;
+import com.community.huiju.model.TpEquipmentTree;
 import com.community.huiju.service.TaVistorServiceI;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +43,9 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TpEquipmentTreeMapper tpEquipmentTreeMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean insertTaVistor(TaVisitor taVisitor, UserElement userElement) {
@@ -77,7 +82,7 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         }
 
         // 推送海康
-        temporaryRegister(userElement.getId(),taVisitor,response);
+        temporaryRegister(userElement.getId(),taVisitor, userElement.getCommunityId(), response);
 
         return response;
     }
@@ -104,11 +109,15 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
      * @param userId 被访人ID
      * @param visitor
      */
-    private void temporaryRegister(Integer userId,TaVisitor visitor,ResponseBean response){
+    private void temporaryRegister(Integer userId,TaVisitor visitor, Integer communityId ,ResponseBean response){
+
+        // 获取设备树，里面有 opUserId
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
+
         TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
         String result = HKOpenApi.temporaryRegister(visitor.getVisitorName(),visitor.getVisitorTel(),
                 Integer.valueOf(visitor.getVisitorNum()),visitor.getVisitorStartTime().getTime(),
-                visitor.getVisitorEndTime().getTime(),taUser.getHkUserId());
+                visitor.getVisitorEndTime().getTime(),taUser.getHkUserId(), tpEquipmentTree.getOpUserUuid(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
 
         JSONObject resultJSON = JSONObject.parseObject(result);
         int errorCode = resultJSON.getInteger("errorCode");

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

@@ -12,13 +12,15 @@
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="doorUuid" property="dooruuid" jdbcType="VARCHAR" />
+    <result column="deviceUuid" property="deviceuuid" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, key, configuration_name, configuration_type, configuration_value, create_tiem, 
-    create_user, update_time, update_user, community_id
+    id, `key`, configuration_name, configuration_type, configuration_value, create_tiem,
+    create_user, update_time, update_user, community_id, doorUuid, deviceUuid
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from tp_configuration
     where id = #{id,jdbcType=INTEGER}
@@ -28,14 +30,16 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpConfiguration" >
-    insert into tp_configuration (id, key, configuration_name, 
-      configuration_type, configuration_value, 
-      create_tiem, create_user, update_time, 
-      update_user, community_id)
-    values (#{id,jdbcType=INTEGER}, #{key,jdbcType=VARCHAR}, #{configurationName,jdbcType=VARCHAR}, 
-      #{configurationType,jdbcType=INTEGER}, #{configurationValue,jdbcType=VARCHAR}, 
-      #{createTiem,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{updateUser,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER})
+    insert into tp_configuration (id, `key`, configuration_name,
+      configuration_type, configuration_value,
+      create_tiem, create_user, update_time,
+      update_user, community_id, doorUuid,
+      deviceUuid)
+    values (#{id,jdbcType=INTEGER}, #{key,jdbcType=VARCHAR}, #{configurationName,jdbcType=VARCHAR},
+      #{configurationType,jdbcType=INTEGER}, #{configurationValue,jdbcType=VARCHAR},
+      #{createTiem,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
+      #{updateUser,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{dooruuid,jdbcType=VARCHAR},
+      #{deviceuuid,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpConfiguration" >
     insert into tp_configuration
@@ -44,7 +48,7 @@
         id,
       </if>
       <if test="key != null" >
-        key,
+        `key`,
       </if>
       <if test="configurationName != null" >
         configuration_name,
@@ -70,6 +74,12 @@
       <if test="communityId != null" >
         community_id,
       </if>
+      <if test="dooruuid != null" >
+        doorUuid,
+      </if>
+      <if test="deviceuuid != null" >
+        deviceUuid,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -102,13 +112,19 @@
       <if test="communityId != null" >
         #{communityId,jdbcType=INTEGER},
       </if>
+      <if test="dooruuid != null" >
+        #{dooruuid,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceuuid != null" >
+        #{deviceuuid,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpConfiguration" >
     update tp_configuration
     <set >
       <if test="key != null" >
-        key = #{key,jdbcType=VARCHAR},
+        `key` = #{key,jdbcType=VARCHAR},
       </if>
       <if test="configurationName != null" >
         configuration_name = #{configurationName,jdbcType=VARCHAR},
@@ -134,12 +150,18 @@
       <if test="communityId != null" >
         community_id = #{communityId,jdbcType=INTEGER},
       </if>
+      <if test="dooruuid != null" >
+        doorUuid = #{dooruuid,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceuuid != null" >
+        deviceUuid = #{deviceuuid,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpConfiguration" >
     update tp_configuration
-    set key = #{key,jdbcType=VARCHAR},
+    set `key` = #{key,jdbcType=VARCHAR},
       configuration_name = #{configurationName,jdbcType=VARCHAR},
       configuration_type = #{configurationType,jdbcType=INTEGER},
       configuration_value = #{configurationValue,jdbcType=VARCHAR},
@@ -147,7 +169,9 @@
       create_user = #{createUser,jdbcType=INTEGER},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
-      community_id = #{communityId,jdbcType=INTEGER}
+      community_id = #{communityId,jdbcType=INTEGER},
+      doorUuid = #{dooruuid,jdbcType=VARCHAR},
+      deviceUuid = #{deviceuuid,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -0,0 +1,93 @@
+<?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.TpRoomNoEquipmentMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpRoomNoEquipment" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="room_no_id" property="roomNoId" jdbcType="INTEGER" />
+    <result column="equipment_id" property="equipmentId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, room_no_id, equipment_id, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_room_no_equipment
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_room_no_equipment
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpRoomNoEquipment" >
+    insert into tp_room_no_equipment (id, community_id, room_no_id, 
+      equipment_id, create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{roomNoId,jdbcType=INTEGER}, 
+      #{equipmentId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpRoomNoEquipment" >
+    insert into tp_room_no_equipment
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="roomNoId != null" >
+        room_no_id,
+      </if>
+      <if test="equipmentId != null" >
+        equipment_id,
+      </if>
+      <if test="createDate != null" >
+        create_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="roomNoId != null" >
+        #{roomNoId,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentId != null" >
+        #{equipmentId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpRoomNoEquipment" >
+    update tp_room_no_equipment
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="roomNoId != null" >
+        room_no_id = #{roomNoId,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentId != null" >
+        equipment_id = #{equipmentId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpRoomNoEquipment" >
+    update tp_room_no_equipment
+    set community_id = #{communityId,jdbcType=INTEGER},
+      room_no_id = #{roomNoId,jdbcType=INTEGER},
+      equipment_id = #{equipmentId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -28,7 +28,7 @@ public class HKOpenApi {
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("pageNo",map.get("pageNo"));
@@ -39,7 +39,7 @@ public class HKOpenApi {
         log.info("获取 监控列表 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("获取 监控列表 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -60,7 +60,7 @@ public class HKOpenApi {
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_LIKE_DEPT_NAME;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("pageNo",map.get("pageNo"));
@@ -71,7 +71,7 @@ public class HKOpenApi {
         log.info("根据部门名称分页获取部门 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("根据部门名称分页获取部门 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -93,7 +93,7 @@ public class HKOpenApi {
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
         //设置APPKEY获取中心信息
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
@@ -106,7 +106,7 @@ public class HKOpenApi {
         log.info("添加人员 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("添加人员 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -127,7 +127,7 @@ public class HKOpenApi {
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_OPEN_CARD;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
@@ -139,7 +139,7 @@ public class HKOpenApi {
         log.info("批量开卡 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("批量开卡 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -155,22 +155,22 @@ public class HKOpenApi {
      *
      * @return
      */
-    public static String getACDevicesByUnitUuids(){
+    public static String getACDevicesByUnitUuids(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("pageNo",1);
         parMap.put("pageSize",10);
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         parMap.put("unitUuids","1048576");
         String params =  JSON.toJSONString(parMap);
         log.info("获取中心UUID集获取中心下的门禁设备请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("获取 中心UUID集获取中心下的门禁设备 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -186,21 +186,21 @@ public class HKOpenApi {
      *
      * @return
      */
-    public static String getDoors(){
+    public static String getDoors(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GET_DOORS; // HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("pageNo",1);
         parMap.put("pageSize",10);
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         String params =  JSON.toJSONString(parMap);
         log.info("分页获取门禁点信息请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("分页获取门禁点信息 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -216,22 +216,22 @@ public class HKOpenApi {
      *
      * @return
      */
-    public static String getUnitsByUuids(){
+    public static String getUnitsByUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("pageNo",1);
         parMap.put("pageSize",10);
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         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, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("获取控制中心信息 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -246,23 +246,23 @@ public class HKOpenApi {
      *  根据中心UUID分页获取下级区域
      * @return
      */
-    public static String getRegionsByUnitUuid(){
+    public static String getRegionsByUnitUuid(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("pageNo",1);
         parMap.put("pageSize",10);
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         parMap.put("parentUuid","1048576");
         parMap.put("allChildren",1);
         String params =  JSON.toJSONString(parMap);
         log.info("根据中心UUID分页获取下级区域请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("根据中心UUID分页获取下级区域 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -277,20 +277,20 @@ public class HKOpenApi {
      * 根据区域UUID集获取门禁点
      * @return
      */
-    public static String getDoorsByRegionUuids(){
+    public static String getDoorsByRegionUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOORS_BY_REGION_UUIDS;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         parMap.put("regionUuids","2a36878c9a4a49d290d253ac1b4746dc");
         String params =  JSON.toJSONString(parMap);
         log.info("根据区域UUID集获取门禁点请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("根据区域UUID集获取门禁点 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -305,23 +305,24 @@ public class HKOpenApi {
      * 根据人员ID集添加权限
      * @return
      */
-    public static String addAuthoritiesByPersonIds(String personIds){
+    public static String addAuthoritiesByPersonIds(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ADD_AUTHORITIES_BY_PERSONIDS;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("personIds",personIds);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
+        parMap.put("personIds",map.get("personIds"));
         parMap.put("doorGroupUuids","");
         // TODO 目前写死
-        parMap.put("doorUuids","91b8ce635b634d468cde925af6e4274c,d40b23e316364bb5a276b99bb6327181,7f866e918ab8452f9eb1d8a25e481530,8b8256fc605d428c9dc797451e3dc432,84d619c5e84942f68047f0bca93fc041");
+        // parMap.put("doorUuids","91b8ce635b634d468cde925af6e4274c,d40b23e316364bb5a276b99bb6327181,7f866e918ab8452f9eb1d8a25e481530,8b8256fc605d428c9dc797451e3dc432,84d619c5e84942f68047f0bca93fc041");
+        parMap.put("doorUuids",map.get("doorUuids"));
         String params =  JSON.toJSONString(parMap);
         log.info("根据人员ID集添加权限请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("根据人员ID集添加权限 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -336,21 +337,21 @@ public class HKOpenApi {
      * 根据设备UUID集异动下载门禁权限
      * @return
      */
-    public static String downloadAuthorityByDeviceUuids(){
+    public static String downloadAuthorityByDeviceUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         // TODO 目前写死
         parMap.put("deviceUuids","fe471fe7c95f408a9e41e029dc0687cf,fe471fe7c95f408a9e41e029dc0687cf,992f53f2c87b4d2a87cf517e7b57366f,a792802b88f749c9b4c6fbf8a610111e,3bff3477889c4b3c983871ea46b66605");
         String params =  JSON.toJSONString(parMap);
         log.info("根据设备UUID集异动下载门禁权限请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("根据设备UUID集异动下载门禁权限 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -364,28 +365,29 @@ public class HKOpenApi {
     /**
      * 指定人员的门禁权限下载
      *
-     * @param personIds 人员ID, 多个用 "," 隔开
+     * @param map
      * @return
      */
-    public static String downloadAuthorityByPersonIds(String personIds){
+    public static String downloadAuthorityByPersonIds(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_AUTHORITY_BY_PERSONIDS;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("personIds",personIds);
-        parMap.put("doorUuids","efcb9a3fe4e64e2f9c0f546c54465524,94bac7e217fb4a698ad086876d347c6a,369b49476a364f87b1c50e99435ecca8,22d8a043cd3f41c5bf1bd976ab5ee65d");
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
+        parMap.put("personIds",map.get("personIds"));
+        // parMap.put("doorUuids","efcb9a3fe4e64e2f9c0f546c54465524,94bac7e217fb4a698ad086876d347c6a,369b49476a364f87b1c50e99435ecca8,22d8a043cd3f41c5bf1bd976ab5ee65d");
+        parMap.put("doorUuids",map.get("doorUuids"));
         parMap.put("planUuid","plan0000000000000000000000000001");
-        parMap.put("operateType",1);
-        parMap.put("includeFinger",1);
+        parMap.put("operateType",map.get("operateType"));
+        parMap.put("includeFinger",map.get("includeFinger"));
         String params =  JSON.toJSONString(parMap);
         log.info("指定人员的门禁权限下载请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
-            log.info("获取 指定人员的门禁权限下载 请求返回结果：{}",data);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
+            log.info("指定人员的门禁权限下载 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
             log.error("指定人员的门禁权限下载获取失败!",e);
@@ -402,22 +404,22 @@ public class HKOpenApi {
      * @param pageSize 一页多少行
      * @return
      */
-    public static String getPlans(Integer pageNo, Integer pageSize) {
+    public static String getPlans(Integer pageNo, Integer pageSize, Map<String, Object> map) {
 
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETPLANS;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         parMap.put("pageNo",pageNo);
         parMap.put("pageSize",pageSize);
         String params =  JSON.toJSONString(parMap);
         log.info("分页获取计划模板请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("获取 分页获取计划模板 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -432,23 +434,24 @@ public class HKOpenApi {
      * 指定人员人脸/指纹权限下载
      * @return
      */
-    public static String downloadFaceAndFingerInfos(String personIds){
+    public static String downloadFaceAndFingerInfos(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_FACE_AND_FINGERINFOS;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         // TODO 目前写死的
-        parMap.put("deviceUuids","992f53f2c87b4d2a87cf517e7b57366f,a792802b88f749c9b4c6fbf8a610111e,3bff3477889c4b3c983871ea46b66605");
-        parMap.put("personIds",personIds);
-        parMap.put("type",1);
+        // parMap.put("deviceUuids","992f53f2c87b4d2a87cf517e7b57366f,a792802b88f749c9b4c6fbf8a610111e,3bff3477889c4b3c983871ea46b66605");
+        parMap.put("deviceUuids",map.get("deviceUuids"));
+        parMap.put("personIds",map.get("personIds"));
+        parMap.put("type",map.get("type"));
         String params =  JSON.toJSONString(parMap);
         log.info("指定人员人脸/指纹权限下载 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("指定人员人脸/指纹权限下载 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -468,16 +471,16 @@ public class HKOpenApi {
     public static String HKpersonGroupId(MultipartFile faceImg,Integer personNo,String personName){
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("appkey", HKConstant.APPKEY);
+        map.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         map.put("time", System.currentTimeMillis());
-        map.put("token", HKConstant.SECRET);
-        map.put("opUserUuid",HKConstant.OP_USER_UUID);
+        map.put("token", map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret")));
+        map.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         map.put("personNo",personNo);
         map.put("personName",personName);
         String params =  JSON.toJSONString(map);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("添加人脸失败!");
@@ -495,7 +498,7 @@ public class HKOpenApi {
      *  * personName 卡号
      * @return
      */
-    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Long personNo,String personName,String cardNo) {
+    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Long personNo,String personName,String cardNo, String  appkey, String secret) {
         byte [] fileByte = new byte[0];
         try {
             if (null!=faceImg) {
@@ -509,9 +512,9 @@ public class HKOpenApi {
         String img = PicUtils.getImgStr(imgs);
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("appkey", HKConstant.APPKEY);
+        map.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         map.put("time", System.currentTimeMillis());
-        map.put("token", HKConstant.SECRET);
+//        map.put("token",map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret")));
         map.put("opUserUuid", HKConstant.OP_USER_UUID);
         map.put("personId", personId);
         map.put("personNo", personNo);
@@ -522,7 +525,7 @@ public class HKOpenApi {
         log.info("修改人脸 请求参数：{}",params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, secret == null ? HKConstant.SECRET : secret), params);
             log.info("修改人脸请求结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -544,7 +547,7 @@ public class HKOpenApi {
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
@@ -557,7 +560,7 @@ public class HKOpenApi {
         log.info("修改人员 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("修改人员 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -578,14 +581,14 @@ public class HKOpenApi {
      * @param personId 被访人ID
      * @return
      */
-    public static String temporaryRegister(String visitorName, String phoneNo,Integer personNum,Long startTime,Long endTime,Integer personId){
+    public static String temporaryRegister(String visitorName, String phoneNo,Integer personNum,Long startTime,Long endTime,Integer personId, String opUserUuid, String appkey, String secret){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.TEMPORARY_REGISTER;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("opUserUuid", opUserUuid == null ? HKConstant.OP_USER_UUID : opUserUuid);
         
         parMap.put("visitorName",visitorName);
         parMap.put("gender",1);
@@ -600,7 +603,7 @@ public class HKOpenApi {
         log.info("未预约登记 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, secret == null ? HKConstant.SECRET : secret), params);
             log.info("未预约登记 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -624,7 +627,7 @@ public class HKOpenApi {
 
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("appkey", HKConstant.APPKEY);
+        map.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         map.put("time", System.currentTimeMillis());
 //        map.put("token", HKConstant.SECRET);
         map.put("opUserUuid", HKConstant.OP_USER_UUID);
@@ -636,7 +639,7 @@ public class HKOpenApi {
         log.info("修改电话 请求参数：{}",params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("修改电话请求结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -665,7 +668,7 @@ public class HKOpenApi {
 
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETDOORDEVICESBYUNITUUIDS;
         Map<String, Object> parMap = new HashMap<>();
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
         parMap.put("pageNo", map.get("pageNo"));
         parMap.put("pageSize", map.get("pageSize"));
@@ -677,7 +680,7 @@ public class HKOpenApi {
 
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("可视对讲 根据中心UUID集分页获取门口机：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -702,7 +705,7 @@ public class HKOpenApi {
     public static String syncControl(Map<String, Object> map) {
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.SYNCCONTROL;
         Map<String, Object> parMap = new HashMap<>();
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid", map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
         parMap.put("longNums", map.get("longNums"));
@@ -712,7 +715,7 @@ public class HKOpenApi {
 
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("可视对讲 异步反控开门：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -730,10 +733,10 @@ public class HKOpenApi {
      * @param longNums
      * @return
      */
-    public static String visualIntercom(String opUserUuid, Integer opType,List<Integer> personIds,List<String> longNums ) {
+    public static String visualIntercom(String opUserUuid, Integer opType,List<Integer> personIds,List<String> longNums, String appkey, String secret) {
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOADFACE;
         HashMap map = new HashMap<>();
-        map.put("appkey", HKConstant.APPKEY);
+        map.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         map.put("time", System.currentTimeMillis());
         map.put("opUserUuid", opUserUuid == null ? HKConstant.OP_USER_UUID : opUserUuid);
         map.put("opType", opType);
@@ -743,7 +746,7 @@ public class HKOpenApi {
         log.info("人脸下发请求参数:" + param);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + param, param, HKConstant.SECRET), param);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + param, param,secret == null ? HKConstant.SECRET : secret), param);
             log.info("可视对讲人脸权限下发：{}", data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -767,7 +770,7 @@ public class HKOpenApi {
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ADDOUTDOORAUTH;
 
         Map<String, Object> parMap = new HashMap<>();
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid", map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
         parMap.put("authName", map.get("authName"));
@@ -779,7 +782,7 @@ public class HKOpenApi {
 
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("可视对讲 根据人员 ID 集添加权限并下发：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -804,7 +807,7 @@ public class HKOpenApi {
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DELOUTDOORAUTH;
 
         Map<String, Object> parMap = new HashMap<>();
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid", map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
         parMap.put("operateType", 2);
@@ -816,7 +819,7 @@ public class HKOpenApi {
 
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("可视对讲 根据人员 ID 集删除权限并下发：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -841,7 +844,7 @@ public class HKOpenApi {
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOADFINGER;
 
         Map<String, Object> parMap = new HashMap<>();
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid", map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
         parMap.put("opType", map.get("opType"));
@@ -853,7 +856,7 @@ public class HKOpenApi {
 
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("可视对讲 指定人员指纹权限下载：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -871,7 +874,7 @@ public class HKOpenApi {
     public static String getUsers(Map<String, Object> map){
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETUSERS;
         Map<String, Object> parMap = new HashMap<>();
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid", map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
         parMap.put("pageNo", map.get("pageNo"));
@@ -882,7 +885,7 @@ public class HKOpenApi {
 
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("分页获取用户下载：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -900,7 +903,7 @@ public class HKOpenApi {
     public static String getPersonInfosEx(Map<String, Object> map){
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETPERSONINFOSEX;
         Map<String, Object> parMap = new HashMap<>();
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid", map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
         parMap.put("pageNo", map.get("pageNo"));
@@ -911,7 +914,7 @@ public class HKOpenApi {
 
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("分页获取人员下载：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -925,18 +928,18 @@ public class HKOpenApi {
      *  获取默认用户UUID
      * @return
      */
-    public static String getDefaultUserUuid(){
+    public static String getDefaultUserUuid(String appkey, String secret){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADDRESS_GET_DEFAULT_USER_UUID;
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         String params =  JSON.toJSONString(parMap);
         log.info("获取 获取默认用户UUID 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, secret == null ? HKConstant.SECRET :  secret), params);
             log.info("获取 获取默认用户UUID 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -972,22 +975,25 @@ public class HKOpenApi {
         }
 
     }
-    // 删除当前人脸设备信息
-    public static String deleteUser(Integer opUserUuid) {
+    /**
+     *     删除当前人脸设备信息
+     */
+    public static String deleteUser(Map<String,Object> map) {
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_DELETE_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("personIds",opUserUuid+"");
-        parMap.put("doorUuids","91b8ce635b634d468cde925af6e4274c,d40b23e316364bb5a276b99bb6327181,7f866e918ab8452f9eb1d8a25e481530,8b8256fc605d428c9dc797451e3dc432,84d619c5e84942f68047f0bca93fc041");
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
+        parMap.put("personIds",map.get("personIds"));
+        // parMap.put("doorUuids","91b8ce635b634d468cde925af6e4274c,d40b23e316364bb5a276b99bb6327181,7f866e918ab8452f9eb1d8a25e481530,8b8256fc605d428c9dc797451e3dc432,84d619c5e84942f68047f0bca93fc041");
+        parMap.put("doorUuids",map.get("doorUuids"));
         String params =  JSON.toJSONString(parMap);
         log.info("删除人脸 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("删除人脸 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -996,23 +1002,27 @@ public class HKOpenApi {
         }
         return data;
     }
-        // 查询当前人脸设备信息
-    public static String selectUserFace(Integer opUserUuid) {
+
+
+    /**
+     *     查询当前人脸设备信息
+     */
+    public static String selectUserFace(Map<String,Object> map) {
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("pageNo",1);
-        parMap.put("pageSize",100);
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("personIds",opUserUuid+"");
+        parMap.put("pageSize",300);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
+        parMap.put("personIds",map.get("personIds"));
         String params =  JSON.toJSONString(parMap);
         log.info("查询设备人脸 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("查询设备人脸 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
@@ -1026,20 +1036,20 @@ public class HKOpenApi {
      * 人员异动（同步硬件）
      * @return
      */
-    public static String selectUserSynchronization() {
+    public static String selectUserSynchronization(Map<String,Object> map) {
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_USER_SDH;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         parMap.put("deviceUuids","91b8ce635b634d468cde925af6e4274c,d40b23e316364bb5a276b99bb6327181,7f866e918ab8452f9eb1d8a25e481530,8b8256fc605d428c9dc797451e3dc432,84d619c5e84942f68047f0bca93fc041");
         String params =  JSON.toJSONString(parMap);
         log.info("人员异动 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
             log.info("人员异动 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();