合并

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

@@ -453,10 +453,21 @@ public class FaceServicelimpl implements FaceServiceI {
             responseBean.addError(errorMessage);
             return responseBean;
         }
+
+
         // 异动同步到设备
-         HKOpenApi.appointJurisdiction(taUser.getHkUserId()+"" );
+        Map<String,Object> appointJurisdictionMap = Maps.newHashMap();
+        appointJurisdictionMap.put("appkey", tpEquipmentTree.getAppkey());
+        appointJurisdictionMap.put("secret", tpEquipmentTree.getSecret());
+        appointJurisdictionMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        appointJurisdictionMap.put("personIds", taUser.getHkUserId()+"" );
+        appointJurisdictionMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
+        appointJurisdictionMap.put("operateType",3);
+        appointJurisdictionMap.put("includeFinger",0);
+
+         HKOpenApi.appointJurisdiction(appointJurisdictionMap);
         // HKOpenApi.selectUserSynchronization();
-        ihkService.downloadAuthorityByDeviceUuids();
+        // ihkService.downloadAuthorityByDeviceUuids();
         return responseBean;
 
     }

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

@@ -1063,24 +1063,27 @@ public class HKOpenApi {
      * 指定人员的门禁权限下载 == 人员异动 - 风险太大不可控（同步硬件）
      * @return
      */
-    public static String appointJurisdiction(String personIds) {
+    public static String appointJurisdiction(Map<String,Object> map) {
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_APPOIN;
         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",personIds);
-        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"));
         parMap.put("planUuid","plan0000000000000000000000000001");
-        parMap.put("operateType",3);
-        parMap.put("includeFinger",0);
+//        parMap.put("operateType",3);
+//        parMap.put("includeFinger",0);
+        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);
+            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();