合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKConstant.java

@@ -135,6 +135,36 @@ public class HKConstant {
      */
     public static final String TEMPORARY_REGISTER = "/openapi/service/rvs/register/temporaryRegister";
 
-    
+    // ------------------ 可视对讲 ----------------------
+
+    /**
+     * 可视对讲 根据中心UUID集分页获取门口机【V2.8.2】
+     */
+    public static final String GETDOORDEVICESBYUNITUUIDS = "/openapi/service/vis/res/getDoorDevicesByUnitUuids";
+
+    /**
+     * 可视对讲 异步反控开门【V2.8.2】
+     */
+    public static final String SYNCCONTROL = "/openapi/service/vis/control/syncControl";
+
+    /**
+     * 可视对讲  根据人员 ID 集添加权限并下发
+     */
+    public static final String ADDOUTDOORAUTH = "/openapi/service/vis/addOutDoorAuth";
+
+    /**
+     * 可视对讲 根据人员 ID 集删除权限并下发
+     */
+    public static final String DELOUTDOORAUTH = "/openapi/service/vis/delOutDoorAuth";
+
+    /**
+     * 可视对讲 指定人员人脸权限下载
+     */
+    public static final String DOWNLOADFACE = "/openapi/service/vis/downloadFace";
+
+    /**
+     * 可视对讲 指定人员指纹权限下载
+     */
+    public static final String DOWNLOADFINGER =  "/openapi/service/vis/downloadFinger";
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -611,26 +611,15 @@ public class HKOpenApi {
     
     public static void main(String[] args) {
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + "/openapi/service/eps/subscribeEventsFromMQEx";
-        //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
-        //设置时间参数
-        parMap.put("time", System.currentTimeMillis());
-        parMap.put("eventTypes","198914,199941,983309,983299");
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        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);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("获取失败!",e);
-            throw new RuntimeException("获取失败!");
-        }
-    
-        System.out.println(data);
+        parMap.put("pageNo", 1);
+        parMap.put("pageSize", 100);
+        parMap.put("unitUuids", "e2a3606295f34bc5b336734f4894d708");
+        String data = HKOpenApi.HKgetDoorDevicesByUnitUuids(parMap);
+
+//        Map<String,Object> parMap = Maps.newHashMap();
+//        parMap.put("longNums", "10010100000");
+//        String data = HKOpenApi.syncControl(parMap);
+
     }
 
 
@@ -648,7 +637,7 @@ public class HKOpenApi {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", HKConstant.APPKEY);
         map.put("time", System.currentTimeMillis());
-        map.put("token", HKConstant.SECRET);
+//        map.put("token", HKConstant.SECRET);
         map.put("opUserUuid", HKConstant.OP_USER_UUID);
         map.put("personId", personId);
         map.put("personNo", personNo);
@@ -667,4 +656,83 @@ public class HKOpenApi {
         }
         return data;
     }
+
+    /**
+     * 根据中心UUID集分页获取门口机
+     *
+     * pageNo 当前页码
+     *
+     * pageSize 每页数据记录数 建议400以下，不超过1000
+     *
+     * opUserUuid 操作用户UUID 详见opUserUuid的获取
+     *
+     * unitUuids 单元中心UUID集 以“,”分割，详见组织管理
+     *
+     *
+     * @param map
+     * @return
+     */
+    public static String HKgetDoorDevicesByUnitUuids(Map<String, Object> map){
+
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETDOORDEVICESBYUNITUUIDS;
+        Map<String, Object> parMap = new HashMap<>();
+        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo", map.get("pageNo"));
+        parMap.put("pageSize", map.get("pageSize"));
+        parMap.put("opUserUuid", HKConstant.OP_USER_UUID);
+        parMap.put("unitUuids", map.get("unitUuids"));
+
+        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);
+            log.info("根据中心UUID集分页获取门口机：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("根据中心UUID集分页获取门口机 请求失败：{}",e);
+            throw new RuntimeException("根据中心UUID集分页获取门口机失败!");
+        }
+        return data;
+
+    }
+
+    /**
+     * 异步反控开门【V2.8.2】
+     *
+     * opUserUuid 操作用户UUID 详见opUserUuid的获取
+     *
+     * longNums 设备编号集 门口机设备编号集，以“,”分割
+     *
+     *
+     * @param map
+     * @return
+     */
+    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("time", System.currentTimeMillis());
+        parMap.put("opUserUuid", HKConstant.OP_USER_UUID);
+        parMap.put("longNums", map.get("longNums"));
+
+        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);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("异步反控开门 请求失败：{}",e);
+            throw new RuntimeException("异步反控开门失败!");
+        }
+        return data;
+    }
+
+
+ 
 }

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

@@ -324,7 +324,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
         //身份为家属租客，状态为已停用
         if (Constant.INVALID.equals(taUser.getStatus())
-                && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
+                && ((Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName()))){
 
             response.addError("9996", "您的身份已停用，请联系物业");
             return response;
@@ -383,7 +383,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
         //身份为家属租客，状态为已停用
         if (Constant.INVALID.equals(taUser.getStatus())
-                && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
+                && ((Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName()))){
 
             responseBean.addError("9996", "您的身份已停用，请联系物业");
             return responseBean;