修改海康人员添加， 手机号为 remake字段

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

@@ -173,7 +173,7 @@ public class FaceServicelimpl implements FaceServiceI {
         face.setFaceImg(faceImg);
         face.setUpdateUser(userElement.getId());
         face.setUpdateDate(new Date());
-        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid());
         if (resps.getCode().equals("0")) {
             resps.addSuccess((Object) faceImg);
         } else {
@@ -197,7 +197,7 @@ public class FaceServicelimpl implements FaceServiceI {
      * @param openapi_ip_port_http 海康服务器地址
      * @return
      */
-    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, Integer unitId, String  appkey, String secret, String openapi_ip_port_http) {
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, Integer unitId, String  appkey, String secret, String openapi_ip_port_http, String opUserUuid) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
         if (user.getHkUserId() == null) {
@@ -214,7 +214,7 @@ public class FaceServicelimpl implements FaceServiceI {
             Integer faceNum = (Integer) jsonObject.get("face_num");
 
             /*推送海康*/
-            String data = HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo(), appkey, secret, openapi_ip_port_http);
+            String data = HKOpenApi.HKpersonGroupId(uploadFile, 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) {
@@ -401,7 +401,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, 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 {

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

@@ -131,6 +131,7 @@ public class HKServiceImpl implements IHKService {
             map.put("secret", tpEquipmentTree.getSecret());
             map.put("appkey", tpEquipmentTree.getAppkey());
             map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
             HKOpenApi.addAuthoritiesByPersonIds(map);
 
             // 下发门禁权限
@@ -142,6 +143,7 @@ public class HKServiceImpl implements IHKService {
             downloadAuthorityByPersonIdsMap.put("secret", tpEquipmentTree.getSecret());
             downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
             downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            downloadAuthorityByPersonIdsMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
             HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
 
         }
@@ -154,6 +156,7 @@ public class HKServiceImpl implements IHKService {
         addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
         addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
         addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
 
         // 单元门口机
         List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
@@ -197,6 +200,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);
 
@@ -204,11 +208,13 @@ public class HKServiceImpl implements IHKService {
         Map<String, Object> parUser = Maps.newHashMap();
         parUser.put("personNo", user.getHkPersonNo());
         parUser.put("personName", user.getUserName());
-        parUser.put("phoneNo", user.getLoginName());
+        // parUser.put("phoneNo", user.getLoginName());
+        parUser.put("remark", user.getLoginName());
         //parUser.put("deptUuid", deptUuid);
         parUser.put("secret", tpEquipmentTree.getSecret());
         parUser.put("appkey", tpEquipmentTree.getAppkey());
         parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
         Integer errorCode = (Integer) resultMap.get("errorCode");
         if (errorCode == 0) {
@@ -253,6 +259,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");
@@ -306,6 +313,7 @@ public class HKServiceImpl implements IHKService {
         parOpenCard.put("secret", tpEquipmentTree.getSecret());
         parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
         parOpenCard.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parOpenCard.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
         int code = (int) openCardJSON.get("errorCode");
         if (code == 0) {
@@ -365,6 +373,7 @@ public class HKServiceImpl implements IHKService {
         downloadFingerMap.put("personIds", map.get("personIds"));
         downloadFingerMap.put("longNums", map.get("longNums"));
         downloadFingerMap.put("openapi_ip_port_http", map.get("openapi_ip_port_http"));
+        downloadFingerMap.put("opUserUuid", map.get("opUserUuid"));
         // 可视对讲 指定人员指纹权限下载
         HKOpenApi.downloadFinger(downloadFingerMap);
     }
@@ -402,6 +411,7 @@ public class HKServiceImpl implements IHKService {
         parMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         parMap.put("secret", tpEquipmentTree.getSecret());
         parMap.put("appkey", tpEquipmentTree.getAppkey());
+        parMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         String data = HKOpenApi.syncControl(parMap);
         JSONObject jsonObject = JSONObject.parseObject(data);
         int errorCode = jsonObject.getInteger("errorCode");

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

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