合并

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

@@ -659,7 +659,7 @@ public class HKOpenApi {
     }
 
     /**
-     * 根据中心UUID集分页获取门口机
+     * 可视对讲 根据中心UUID集分页获取门口机
      *
      * pageNo 当前页码
      *
@@ -681,27 +681,27 @@ public class HKOpenApi {
         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("opUserUuid", map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
         parMap.put("unitUuids", map.get("unitUuids"));
 
         String params = JSON.toJSONString(parMap);
-        log.info("根据中心UUID集分页获取门口机 请求参数：{}",params);
+        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);
+            log.info("可视对讲 根据中心UUID集分页获取门口机：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("根据中心UUID集分页获取门口机 请求失败：{}",e);
-            throw new RuntimeException("根据中心UUID集分页获取门口机失败!");
+            log.error("可视对讲 根据中心UUID集分页获取门口机 请求失败：{}",e);
+            throw new RuntimeException("可视对讲 根据中心UUID集分页获取门口机失败!");
         }
         return data;
 
     }
 
     /**
-     * 异步反控开门【V2.8.2】
+     * 可视对讲 异步反控开门【V2.8.2】
      *
      * opUserUuid 操作用户UUID 详见opUserUuid的获取
      *
@@ -716,20 +716,20 @@ public class HKOpenApi {
         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("opUserUuid", map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
         parMap.put("longNums", map.get("longNums"));
 
         String params = JSON.toJSONString(parMap);
-        log.info("异步反控开门 请求参数：{}",params);
+        log.info("可视对讲 异步反控开门 请求参数：{}",params);
 
         String data = null;
         try {
             data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
-            log.info("异步反控开门：{}",data);
+            log.info("可视对讲 异步反控开门：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("异步反控开门 请求失败：{}",e);
-            throw new RuntimeException("异步反控开门失败!");
+            log.error("可视对讲 异步反控开门 请求失败：{}",e);
+            throw new RuntimeException("可视对讲 异步反控开门失败!");
         }
         return data;
     }
@@ -742,27 +742,136 @@ 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 url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOADFACE;
-       HashMap map= new HashMap<>();
-       map.put("appkey",HKConstant.APPKEY);
-       map.put("time",System.currentTimeMillis());
-       map.put("opUserUuid",opUserUuid == null?HKConstant.OP_USER_UUID:opUserUuid);
-       map.put("opType",opType);
-       map.put("personIds",personIds);
-       map.put("longNums",longNums);
+        HashMap map = new HashMap<>();
+        map.put("appkey", HKConstant.APPKEY);
+        map.put("time", System.currentTimeMillis());
+        map.put("opUserUuid", opUserUuid == null ? HKConstant.OP_USER_UUID : opUserUuid);
+        map.put("opType", opType);
+        map.put("personIds", personIds);
+        map.put("longNums", longNums);
         String param = JSON.toJSONString(map);
-        log.info("人脸下发请求参数:"+param);
+        log.info("人脸下发请求参数:" + param);
         String data = null;
         try {
             data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + param, param, HKConstant.SECRET), param);
-            log.info("可视对讲人脸权限下发：{}",data);
+            log.info("可视对讲人脸权限下发：{}", data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("可视对讲人脸权限下发错误：{}",e);
+            log.error("可视对讲人脸权限下发错误：{}", e);
             throw new RuntimeException("下发错误!");
         }
-    return null;
-}
+        return null;
+    }
+    /**
+     * 可视对讲 根据人员 ID 集添加权限并下发
+     *
+     * opUserUuid 操作用户 UUID String 是
+     * authName 权限组名称 String 是
+     * personIds 人员 ID 集合 List<Integer>是 不超过 400
+     * longNums 设备长号集合 List<String>是 不超过 400
+     *
+     * @param map
+     * @return
+     */
+    public static String addOutDoorAuth(Map<String, Object> map) {
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ADDOUTDOORAUTH;
+
+        Map<String, Object> parMap = new HashMap<>();
+        parMap.put("appkey", HKConstant.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"));
+        parMap.put("personIds", map.get("personIds"));
+        parMap.put("longNums", map.get("longNums"));
+
+        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);
+            log.info("可视对讲 根据人员 ID 集添加权限并下发：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("可视对讲 根据人员 ID 集添加权限并下发 请求失败：{}",e);
+            throw new RuntimeException("可视对讲 根据人员 ID 集添加权限并下发失败!");
+        }
+        return data;
+    }
+
+    /**
+     * 可视对讲 根据人员 ID 集删除权限并下发
+     *
+     * opUserUuid 操作用户 UUID String 是
+     * operateType  操作类型 Integer 是 2 为根据人员-门口机删除权限 (忽略不写, 方法里面已经写上)
+     * personIds 人员 ID 集合 List<Integer>是 不超过 400
+     * longNums 设备长号集合 List<String>是 不超过 400
+     *
+     * @param map
+     * @return
+     */
+    public static String delOutDoorAuth(Map<String, Object> map) {
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DELOUTDOORAUTH;
+
+        Map<String, Object> parMap = new HashMap<>();
+        parMap.put("appkey", HKConstant.APPKEY);
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid", map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("operateType", 2);
+        parMap.put("personIds", map.get("personIds"));
+        parMap.put("longNums", map.get("longNums"));
+
+        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);
+            log.info("可视对讲 根据人员 ID 集删除权限并下发：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("可视对讲 根据人员 ID 集删除权限并下发 请求失败：{}",e);
+            throw new RuntimeException("可视对讲 根据人员 ID 集删除权限并下发失败!");
+        }
+        return data;
+    }
 
+    /**
+     * 可视对讲 指定人员指纹权限下载
+     *
+     * opUserUuid 操作用户 UUID String 是
+     * opType 操作类型 Integer 是 1 为下发权限；2 为删除权限
+     * personIds 人员 ID 集合 List<Integer>是 不超过 400
+     * longNums 设备长号集合 List<String>是 不超过 400
+     *
+     * @param map
+     * @return
+     */
+    public static String downloadFinger(Map<String, Object> map) {
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOADFINGER;
+
+        Map<String, Object> parMap = new HashMap<>();
+        parMap.put("appkey", HKConstant.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"));
+        parMap.put("personIds", map.get("personIds"));
+        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/controller/VisualIntercomContrller.java

@@ -0,0 +1,42 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.IVisualIntercomService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "可视对讲 API", description = "可视对讲 API")
+public class VisualIntercomContrller extends BaseController {
+
+    @Autowired
+    private IVisualIntercomService iVisualIntercomService;
+
+    @ApiOperation(value = "门口机开门", notes = "门口机开门")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/visual/syncControl", method = RequestMethod.GET)
+    public ResponseBean syncControl(HttpServletRequest request, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        responseBean = iVisualIntercomService.syncControl(userElement);
+        return responseBean;
+    }
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+
+/**
+ * 可视对讲的业务
+ * @author weiximei
+ */
+public interface IVisualIntercomService {
+
+    /**
+     * 反控开门
+     *
+     *      app端, 发送开门指令
+     *
+     * @param userElement 用户信息体
+     * @return
+     */
+    ResponseBean syncControl(UserElement userElement);
+
+}

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

@@ -232,6 +232,29 @@ public class TaUserServiceImpl implements ITaUserService {
         // 下发门禁权限
         HKOpenApi.downloadAuthorityByDeviceUuids();
 
+        // 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);
+
+        // 可视对讲 指定人员指纹权限下载
+//        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);
+
+
 
         TaUserVO taUserVO = new TaUserVO();
         BeanUtils.copyProperties(user,taUserVO);

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

@@ -0,0 +1,40 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.beust.jcommander.internal.Maps;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.hk.HKOpenApi;
+import com.community.huiju.service.IVisualIntercomService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 可视对讲的业务实现
+ * @author weiximei
+ */
+@Service
+public class VisualIntercomServiceImpl implements IVisualIntercomService {
+
+
+    @Override
+    public ResponseBean syncControl(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // TODO 这里应该根据 小区期楼栋号查询出这个楼栋下面的门口机, 然后发送开门
+
+        Map<String,Object> parMap = Maps.newHashMap();
+        // TODO 只有一个设备, 临时固定的编号
+        parMap.put("longNums", "10010100000");
+        String data = HKOpenApi.syncControl(parMap);
+        JSONObject jsonObject = JSONObject.parseObject(data);
+        int errorCode = jsonObject.getInteger("errorCode");
+        if (errorCode == 0) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
+}